Fix Oryx-CI build (#64)

* Tag build image with build name and number * allowing uppercase docker tags * Fixing timeout for build step * Fix indentation * More indentation * removing tag command
microsoft · Apr 10, 2019 · 26510ac · 26510ac
1 parent cbf9f3d
commit 26510ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/vsts/pipelines/_buildTemplate.yml b/vsts/pipelines/_buildTemplate.yml
@@ -140,6 +140,7 @@ steps:
     action: 'Push images'
     imageNamesPath: '$(Build.ArtifactStagingDirectory)/images/build-images.txt'
     includeLatestTag: false
+    enforceDockerNamingConvention: false
   condition: and(succeeded(), eq(variables['PushBuildImages'], 'true'), eq(variables['BuildBuildImages'], 'true'))
 
 - task: Docker@1
@@ -151,6 +152,7 @@ steps:
     pushMultipleImages: true
     imageNamesPath: '$(Build.ArtifactStagingDirectory)/images/build-images-acr.txt'
     includeLatestTag: false
+    enforceDockerNamingConvention: false
   condition: and(succeeded(), eq(variables['PushBuildImages'], 'true'), eq(variables['BuildBuildImages'], 'true'))
 
 - task: Docker@0
@@ -161,6 +163,7 @@ steps:
     action: 'Push images'
     imageNamesPath: '$(Build.ArtifactStagingDirectory)/images/runtime-images.txt'
     includeLatestTag: false
+    enforceDockerNamingConvention: false
   condition: and(succeeded(), eq(variables['PushRuntimeImages'], 'true'), eq(variables['BuildRuntimeImages'], 'true'))
 
 - task: Docker@1
@@ -172,6 +175,7 @@ steps:
     pushMultipleImages: true
     imageNamesPath: '$(Build.ArtifactStagingDirectory)/images/runtime-images-acr.txt'
     includeLatestTag: false
+    enforceDockerNamingConvention: false
   condition: and(succeeded(), eq(variables['PushRuntimeImages'], 'true'), eq(variables['BuildRuntimeImages'], 'true'))
 
 - task: ShellScript@2

diff --git a/vsts/pipelines/ci.yml b/vsts/pipelines/ci.yml
@@ -17,17 +17,16 @@ jobs:
     demands:
     - msbuild
     - visualstudio
-
   variables:
     SignType: 'test'
-
   steps:
   - template: _signbinary.yml
 
 - job: Job_3
   displayName: Build and Publish Oryx Images
   dependsOn: Job_2
   condition: succeeded()
+  timeoutInMinutes: 120
   pool:
     name: OryxLinux
   steps:
@@ -41,7 +40,6 @@ jobs:
         echo "##vso[task.setvariable variable=PushRuntimeImages;]true"
         echo "##vso[task.setvariable variable=EmbedBuildContextInImages;]true"
     displayName: 'Set variables'
-      
   - template: _buildTemplate.yml
 
 trigger: none