diff --git a/devops/release/scripts/step1_releasepackage.sh b/devops/release/scripts/step1_releasepackage.sh index a05de1cec9d..d52014c6b40 100644 --- a/devops/release/scripts/step1_releasepackage.sh +++ b/devops/release/scripts/step1_releasepackage.sh @@ -27,7 +27,8 @@ echo "##vso[task.setvariable variable=azureserviceoperator_image_version]$azures mkdir release/config -p cp -r _Azure.azure-service-operator/drop/setup.yaml ./release/config -cp -r _Azure.azure-service-operator/drop/*.tgz ./release/config +# Not currently including Helm charts as part of release so skip this +# cp -r _Azure.azure-service-operator/drop/*.tgz ./release/config IMG=${azureserviceoperator_image_public/"public/"/"mcr.microsoft.com/"} echo "updating the manager image " echo $IMG diff --git a/devops/release/scripts/step2_pushdockerimage.sh b/devops/release/scripts/step2_pushdockerimage.sh index 14e4a5f4a82..903ce2e08d7 100644 --- a/devops/release/scripts/step2_pushdockerimage.sh +++ b/devops/release/scripts/step2_pushdockerimage.sh @@ -1,17 +1,17 @@ ACR_NAME='asorelease' -echo "ACR_NAME", $ACR_NAME -echo "azureserviceoperator_image", $(azureserviceoperator_image) -echo "azureserviceoperator_image_base", $(azureserviceoperator_image_base) -echo "azureserviceoperator_image_latest", $(azureserviceoperator_image_latest) -echo "azureserviceoperator_image_public", $(azureserviceoperator_image_public) -echo "azureserviceoperator_image_version", $(azureserviceoperator_image_version) +echo "ACR_NAME: $ACR_NAME" +echo "azureserviceoperator_image: $azureserviceoperator_image" +echo "azureserviceoperator_image_base: $azureserviceoperator_image_base" +echo "azureserviceoperator_image_latest: $azureserviceoperator_image_latest" +echo "azureserviceoperator_image_public: $azureserviceoperator_image_public" +echo "azureserviceoperator_image_version: $azureserviceoperator_image_version" az acr login --name $ACR_NAME -docker pull $ACR_NAME.azurecr.io/$(azureserviceoperator_image) -docker tag $ACR_NAME.azurecr.io/$(azureserviceoperator_image) $ACR_NAME.azurecr.io/$(azureserviceoperator_image_latest) -docker tag $ACR_NAME.azurecr.io/$(azureserviceoperator_image) $ACR_NAME.azurecr.io/$(azureserviceoperator_image_public) +docker pull $ACR_NAME.azurecr.io/$azureserviceoperator_image +docker tag $ACR_NAME.azurecr.io/$azureserviceoperator_image $ACR_NAME.azurecr.io/$azureserviceoperator_image_latest +docker tag $ACR_NAME.azurecr.io/$azureserviceoperator_image $ACR_NAME.azurecr.io/$azureserviceoperator_image_public docker image ls -docker push $ACR_NAME.azurecr.io/$(azureserviceoperator_image_public) -docker push $ACR_NAME.azurecr.io/$(azureserviceoperator_image_latest) +docker push $ACR_NAME.azurecr.io/$azureserviceoperator_image_public +docker push $ACR_NAME.azurecr.io/$azureserviceoperator_image_latest diff --git a/devops/release/scripts/step3_pushhelmchart.sh b/devops/release/scripts/step3_pushhelmchart.sh index ea8fb69012e..14135375005 100644 --- a/devops/release/scripts/step3_pushhelmchart.sh +++ b/devops/release/scripts/step3_pushhelmchart.sh @@ -4,18 +4,18 @@ export HELM_EXPERIMENTAL_OCI=1 ACR_NAME='asorelease' echo "ACR_NAME", $ACR_NAME -echo "azureserviceoperator_image", $(azureserviceoperator_image) -echo "azureserviceoperator_image_base", $(azureserviceoperator_image_base) -echo "azureserviceoperator_image_latest", $(azureserviceoperator_image_latest) -echo "azureserviceoperator_image_public", $(azureserviceoperator_image_public) -echo "azureserviceoperator_image_version", $(azureserviceoperator_image_version) +echo "azureserviceoperator_image: $azureserviceoperator_image" +echo "azureserviceoperator_image_base $azureserviceoperator_image_base" +echo "azureserviceoperator_image_latest: $azureserviceoperator_image_latest" +echo "azureserviceoperator_image_public: $azureserviceoperator_image_public" +echo "azureserviceoperator_image_version: $azureserviceoperator_image_version" -echo $(AZURE_CLIENT_SECRET) | helm registry login $ACR_NAME.azurecr.io --username $(AZURE_CLIENT_ID) --password-stdin +echo $AZURE_CLIENT_SECRET | helm registry login $ACR_NAME.azurecr.io --username $AZURE_CLIENT_ID --password-stdin -helm chart pull $ACR_NAME.azurecr.io/candidate/k8s/asohelmchart:$(azureserviceoperator_image_version) -helm chart export $ACR_NAME.azurecr.io/candidate/k8s/asohelmchart:$(azureserviceoperator_image_version) --destination . +helm chart pull $ACR_NAME.azurecr.io/candidate/k8s/asohelmchart:$azureserviceoperator_image_version +helm chart export $ACR_NAME.azurecr.io/candidate/k8s/asohelmchart:$azureserviceoperator_image_version --destination . cd azure-service-operator -helm chart save . $ACR_NAME.azurecr.io/public/k8s/asohelmchart:$(azureserviceoperator_image_version) +helm chart save . $ACR_NAME.azurecr.io/public/k8s/asohelmchart:$azureserviceoperator_image_version helm chart save . $ACR_NAME.azurecr.io/public/k8s/asohelmchart:latest -helm chart push $ACR_NAME.azurecr.io/public/k8s/asohelmchart:$(azureserviceoperator_image_version) +helm chart push $ACR_NAME.azurecr.io/public/k8s/asohelmchart:$azureserviceoperator_image_version helm chart push $ACR_NAME.azurecr.io/public/k8s/asohelmchart:latest