Merge remote-tracking branch 'mssonic/internal' into internal-stage

lolyu · Sep 2, 2022 · e9d7982 · e9d7982
2 parents a725254 + c350e37
commit e9d7982
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/.azure-pipelines/nightly/arista/vms20-t0-7050cx3-1.internal.yml b/.azure-pipelines/nightly/arista/vms20-t0-7050cx3-1.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Test Parameters

diff --git a/.azure-pipelines/nightly/arista/vms20-t0-7050cx3-2.internal.yml b/.azure-pipelines/nightly/arista/vms20-t0-7050cx3-2.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Test Parameters

diff --git a/.azure-pipelines/nightly/arista/vms20-t1-7050cx3-3.internal.yml b/.azure-pipelines/nightly/arista/vms20-t1-7050cx3-3.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Test Parameters

diff --git a/.azure-pipelines/nightly/arista/vms21-dual-t0-7050-3.internal.yml b/.azure-pipelines/nightly/arista/vms21-dual-t0-7050-3.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Deploy parameters

diff --git a/.azure-pipelines/nightly/arista/vms21-dual-t0-7260.internal.yml b/.azure-pipelines/nightly/arista/vms21-dual-t0-7260.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Deploy parameters

diff --git a/.azure-pipelines/nightly/arista/vms24-dual-t0-7050-1.internal.yml b/.azure-pipelines/nightly/arista/vms24-dual-t0-7050-1.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Deploy parameters

diff --git a/.azure-pipelines/nightly/arista/vms24-dual-t0-7050-2.internal.yml b/.azure-pipelines/nightly/arista/vms24-dual-t0-7050-2.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Deploy parameters

diff --git a/.azure-pipelines/nightly/arista/vms24-t0-7260-2.internal.yml b/.azure-pipelines/nightly/arista/vms24-t0-7260-2.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Test Parameters

diff --git a/.azure-pipelines/nightly/arista/vms7-t0-7260-1.internal.yml b/.azure-pipelines/nightly/arista/vms7-t0-7260-1.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Test Parameters

diff --git a/.azure-pipelines/nightly/arista/vms7-t0-7260-2.internal.yml b/.azure-pipelines/nightly/arista/vms7-t0-7260-2.internal.yml
@@ -24,7 +24,7 @@ parameters:
   # Upgrade parameters
   - name: IMAGE_URL
     type: string
-    default: $(IMAGE_BRCM_ABOOT_202205)
+    default: $(IMAGE_BRCM_ABOOT_INTERNAL)
     displayName: "Image URL"
 
   # Test Parameters

diff --git a/.azure-pipelines/nightly/templates/nightly_test.yml b/.azure-pipelines/nightly/templates/nightly_test.yml
@@ -332,10 +332,11 @@ stages:
                     -r \
                     ${{ parameters.TESTBED_SPECIFIC }} \
                     -e "$PARAMS"
-                if [[ $? == 65 ]]; then
+                RUN_TESTS_RC=$?
+                if [[ $RUN_TESTS_RC == 65 ]]; then
                   echo "pretest failed. Please check the detailed log."
                   exit 1
-                elif [[ $? == 10 ]]; then
+                elif [[ $RUN_TESTS_RC == 10 ]]; then
                   echo "Sanity check failed. Please check the detailed log."
                   exit 1
                 else