From c9f85eb9251eb1d56275d1d1da165b484d7f0d21 Mon Sep 17 00:00:00 2001
From: Manoj Srinivasamurthy <manoj.srinivasamurthy@hashicorp.com>
Date: Fri, 1 Dec 2023 09:23:25 +0530
Subject: [PATCH] NET-6692: Ensure 'upload test results' step is always run
 (#19783)

---
 .github/workflows/nightly-test-integ-peering_commontopo.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly-test-integ-peering_commontopo.yml b/.github/workflows/nightly-test-integ-peering_commontopo.yml
index fdaa8a5cda..418faaf3b4 100644
--- a/.github/workflows/nightly-test-integ-peering_commontopo.yml
+++ b/.github/workflows/nightly-test-integ-peering_commontopo.yml
@@ -106,12 +106,12 @@ jobs:
           TERM: ansi
 
       - name: Authenticate to Vault
-        if: ${{ endsWith(github.repository, '-enterprise') }}
+        if: ${{ endsWith(github.repository, '-enterprise') && !cancelled() }}
         id: vault-auth
         run: vault-auth
 
       - name: Fetch Secrets
-        if: ${{ endsWith(github.repository, '-enterprise') }}
+        if: ${{ endsWith(github.repository, '-enterprise') && !cancelled() }}
         id: secrets
         uses: hashicorp/vault-action@v2.5.0
         with:
@@ -122,6 +122,7 @@ jobs:
               kv/data/github/${{ github.repository }}/datadog apikey | DATADOG_API_KEY;
 
       - name: upload test results
+        if: ${{ !cancelled() }}
         continue-on-error: true
         env:
           DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}"