add back master branch conditions
@@ -97,7 +97,6 @@ steps:
make install
export TEST_APIM_RG=$(TEST_APIM_RG)
export TEST_APIM_NAME=$(TEST_APIM_NAME)
- export BUILD_TAGS=resourcegroup
make test-integration-controllers
displayName: Run tests on a Kind Cluster
continueOnError: 'false'
@@ -279,14 +278,14 @@ steps:
## TODO: Delete Helm deployment
- task: Docker@2
- #condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+ condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
displayName: Login to release ACR
inputs:
command: login
containerRegistry: $(CONTAINER_REGISTRY)
- task: Docker@2
- #condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+ condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
displayName: Build and Push Docker Image $(IMAGE_NAME)
inputs:
command: buildAndPush
@@ -301,7 +300,6 @@ steps:
- script: |
export HELM_EXPERIMENTAL_OCI=1
cd charts/azure-service-operator
- ls
versiontag="$(CONTAINER_REGISTRY_NAME)/$(ASO_HELM_CHART_NAME):$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)"
latesttag="$(CONTAINER_REGISTRY_NAME)/$(ASO_HELM_CHART_NAME):latest"
echo $versiontag
@@ -314,7 +312,7 @@ steps:
continueOnError: 'true'
displayName: Push Helm chart to MCR repo
workingDirectory: '$(System.DefaultWorkingDirectory)'
- #condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+ condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
- script: |
echo "updating kustomize image patch file for manager resource"
@@ -330,10 +328,10 @@ steps:
continueOnError: 'false'
displayName: Package artifacts (image, setup.yaml and helm charts) for release
workingDirectory: '$(System.DefaultWorkingDirectory)'
- #condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+ condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
- task: PublishBuildArtifacts@1
- #condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+ condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
inputs:
pathtoPublish: $(Build.ArtifactStagingDirectory)
artifactName: drop
\ No newline at end of file
