Merge branch '202305' of https://github.com/sonic-net/sonic-buildimage …

…into 202305
Azure · Nov 1, 2024 · 618ce02 · 618ce02
2 parents 5ea7537 + 254035e
commit 618ce02
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -53,9 +53,28 @@ jobs:
         displayName: 'Make configure'
     postSteps:
       - script: |
+          BUILD_REASON=$(Build.Reason)
+          echo "Build.Reason = $BUILD_REASON"
+          echo "Build.DefinitionName = $BUILD_DEFINITIONNAME"
+          if [[ "$BUILD_REASON" != "PullRequest" && "$BUILD_DEFINITIONNAME" == "Azure.sonic-buildimage.official.vs" ]]
+          then
+            PORT=443
+            DOCKERS=$(ls target/docker-ptf.gz)
+            BRANCH=$(Build.SourceBranchName)
+            echo "Branch = $BRANCH"
+            LABELS="$BRANCH"
+            [[ "$BRANCH" == "master" ]] && LABELS="$LABELS latest"
+            for f in $DOCKERS; do
+              echo $f
+              echo "Labels = $LABELS"
+              ./push_docker.sh $f $(REGISTRY_SERVER_PUBLIC) $PORT $(REGISTRY_USERNAME) "$REGISTRY_PASSWD" "$LABELS"
+            done
+          fi
           mkdir -p $(Build.ArtifactStagingDirectory)/target
           mv target/* $(Build.ArtifactStagingDirectory)/target/
-        displayName: Copy Artifacts
+        env:
+          REGISTRY_PASSWD: $(REGISTRY_PASSWD)
+        displayName: Publish to Docker Registry and Copy Artifacts
         condition: always()
       - publish:  $(Build.ArtifactStagingDirectory)
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'

diff --git a/.azure-pipelines/official-build.yml b/.azure-pipelines/official-build.yml
@@ -36,6 +36,7 @@ stages:
 - stage: Build
   pool: sonicbld-1es
   variables:
+  - group: Container-Registry
   - name: CACHE_MODE
     value: wcache
   - template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage