Wali/pipeline token issue fix (#2114)

* added oryx group in the baseimage pipelines
microsoft · Aug 24, 2023 · 1fe2569 · 1fe2569
1 parent 8f8abfa
commit 1fe2569
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 23 deletions.
diff --git a/images/build/installDotNetCore.sh b/images/build/installDotNetCore.sh
@@ -24,9 +24,9 @@ if [ "$sdkStorageAccountUrl" == "$PRIVATE_STAGING_SDK_STORAGE_BASE_URL" ]; then
     set -x
 
     if [ $isSasTokenEmpty -eq 0 ]; then
-      echo "sasToken cannot be empty for $sdkStorageAccountUrl."
+        echo "sasToken cannot be empty for $sdkStorageAccountUrl."
     else
-        echo "sasToken is valid for $sdkStorageAccountUrl."
+        echo "sasToken is empty for $sdkStorageAccountUrl."
     fi
 fi
 echo

diff --git a/images/installPlatform.sh b/images/installPlatform.sh
@@ -61,7 +61,7 @@ if [ "$sdkStorageAccountUrl" == "$PRIVATE_STAGING_SDK_STORAGE_BASE_URL" ]; then
     if [ $isSasTokenEmpty -eq 0 ]; then
       echo "sasToken cannot be empty for $sdkStorageAccountUrl."
     else
-        echo "sasToken is valid for $sdkStorageAccountUrl."
+      echo "sasToken is empty for $sdkStorageAccountUrl."
     fi
 fi
 if [ -z "$debianFlavor" ] || [ "$debianFlavor" == "stretch" ]; then

diff --git a/vsts/pipelines/baseImages/dotnetcore.yml b/vsts/pipelines/baseImages/dotnetcore.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml

diff --git a/vsts/pipelines/baseImages/node.yml b/vsts/pipelines/baseImages/node.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml

diff --git a/vsts/pipelines/baseImages/php-fpm.yml b/vsts/pipelines/baseImages/php-fpm.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml

diff --git a/vsts/pipelines/baseImages/php.yml b/vsts/pipelines/baseImages/php.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml

diff --git a/vsts/pipelines/baseImages/python.yml b/vsts/pipelines/baseImages/python.yml
@@ -1,8 +1,13 @@
 variables:
-    ascName: oryx-automation-service-principal
-    acrName: oryxdevmcr.azurecr.io
-    skipComponentGovernanceDetection: true
-    Packaging.EnableSBOMSigning: true
+- group: Oryx
+- name: ascName
+  value: oryx-automation-service-principal
+- name: acrName
+  value: oryxdevmcr.azurecr.io
+- name: skipComponentGovernanceDetection
+  value: true
+- name: Packaging.EnableSBOMSigning
+  value: true
 
 jobs:
 - template: ../templates/_buildimageBasesJobTemplate.yml