From d502391922e64bb7d46e686e27e34be2bb19f1f0 Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Fri, 27 May 2022 02:00:38 +0000
Subject: [PATCH] Revert "[Ci]: Fix to trigger the publish pipeline in failure
 build issue (#10847)"

This reverts commit 455d44efea4b4dcb70302b00c46cb685c52f97f4.
---
 .azure-pipelines/azure-pipelines-image-template.yml  | 9 ++++-----
 .azure-pipelines/trigger-publish-artifacts-build.yml | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 0cfd94079c5f..6e716604a166 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -57,11 +57,10 @@ jobs:
         condition: failed()
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
         displayName: "Archive failed sonic image"
-      - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-        - template: trigger-publish-artifacts-build.yml
-          parameters:
-            artifactName: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
-            publishPrefix: '$(Build.DefinitionName)/$(Build.SourceBranchName)/$(GROUP_NAME)'
+      - template: trigger-publish-artifacts-build.yml
+        parameters:
+          artifactName: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
+          publishPrefix: '$(Build.DefinitionName)/$(Build.SourceBranchName)/$(GROUP_NAME)'
       - ${{ parameters.postSteps }}
       - template: cleanup.yml
     jobGroups: ${{ parameters.jobGroups }}
diff --git a/.azure-pipelines/trigger-publish-artifacts-build.yml b/.azure-pipelines/trigger-publish-artifacts-build.yml
index 7a6676e0f1ba..83bbfc1150ce 100644
--- a/.azure-pipelines/trigger-publish-artifacts-build.yml
+++ b/.azure-pipelines/trigger-publish-artifacts-build.yml
@@ -20,8 +20,10 @@ steps:
     echo "##vso[task.setvariable variable=sonic_version]$sonic_version"
     echo "##vso[task.setvariable variable=latest_tag]$latest_tag"
     echo "##vso[task.setvariable variable=docker_tags]$docker_tags"
+  condition: ne(variables['Build.Reason'], 'PullRequest')
   displayName: 'Set trigger build variables'
 - task: TriggerBuild@4
+  condition: ne(variables['Build.Reason'], 'PullRequest')
   inputs:
     definitionIsInCurrentTeamProject: false
     teamProject: internal