Remove test-deps images from build for now (#816)

* Remove test-deps images from build for now * update yamls with latest changes from master * remove code from releaseJob.yml to add test-deps images to build
PowerShell · Aug 28, 2024 · 44b2248 · 44b2248
1 parent 1a3b48c
commit 44b2248
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 289 deletions.
diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml
@@ -10,16 +10,6 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build lts
   jobs:
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316
-      artifactSuffix: alpine316
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11
-      artifactSuffix: debian11
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -144,63 +124,3 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316\test-deps
-      artifactSuffix: alpine316_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine317\test-deps
-      artifactSuffix: alpine317_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11\test-deps
-      artifactSuffix: debian11_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi8\test-deps
-      artifactSuffix: ubi8_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu2004_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu2204_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml
@@ -10,16 +10,6 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build preview
   jobs:
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316
-      artifactSuffix: alpine316
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11
-      artifactSuffix: debian11
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -152,83 +132,3 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316\test-deps
-      artifactSuffix: alpine316_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine317\test-deps
-      artifactSuffix: alpine317_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11\test-deps
-      artifactSuffix: debian11_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian12\test-deps
-      artifactSuffix: debian12_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi8\test-deps
-      artifactSuffix: ubi8_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi9\test-deps
-      artifactSuffix: ubi9_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu2004_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu2204_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
@@ -66,12 +66,6 @@ jobs:
   - pwsh: |
       $finalImageName = '${{ parameters.imageName }}'
       $finalContextFolder = 'docker'
-      $testDepsString = 'test-deps'
-      if ($finalImageName.Contains($testDepsString))
-      {
-        $finalImageName = $finalImageName.TrimEnd("\$testDepsString")
-        $finalContextFolder = Join-Path -Path $testDepsString -ChildPath $finalContextFolder
-      }
       $pathToContextFolder = "${{ parameters.channelPath }}/$finalImageName/$finalContextFolder"
       Write-Host "##vso[task.setvariable variable=dockerBuildImageName;isOutput=true]$finalImageName"
       Write-Host "##vso[task.setvariable variable=dockerBuildContextFolder;isOutput=true]$finalContextFolder"

diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml
@@ -10,16 +10,6 @@ stages:
   dependsOn: ['StageResolveVersionandYaml']
   displayName: Build stable
   jobs:
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316
-      artifactSuffix: alpine316
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11
-      artifactSuffix: debian11
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releaseJob.yml@self
     parameters:
       archName: 'Build_linux_amd64'
@@ -152,83 +132,3 @@ stages:
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine316\test-deps
-      artifactSuffix: alpine316_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: alpine317\test-deps
-      artifactSuffix: alpine317_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian11\test-deps
-      artifactSuffix: debian11_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: debian12\test-deps
-      artifactSuffix: debian12_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi8\test-deps
-      artifactSuffix: ubi8_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubi9\test-deps
-      artifactSuffix: ubi9_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu20.04\test-deps
-      artifactSuffix: ubuntu2004_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releaseJob.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: ubuntu22.04\test-deps
-      artifactSuffix: ubuntu2204_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
diff --git a/build.ps1 b/build.ps1
@@ -737,10 +737,13 @@ End {
                 foreach ($osGroup in $osGroups) {
                     $architectureGroups = $osGroup.Group | Group-Object -Property Architecture
                     foreach ($architectureGroup in $architectureGroups) {
-                        # Note: For each image to be built (including test-deps images) the <channel>ReleaseStage.yml file needs to have a template call for the image.
+                        # Note: For each image to be built the <channel>ReleaseStage.yml file needs to have a template call for the image.
                         foreach ($tag in $architectureGroup.Group | Sort-Object -Property dockerfile) {
-                            Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
-                            Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
+                            if (!$tag.Name.ToString().Contains('test-deps'))
+                            {
+                                Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
+                                Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
+                            }
                         }
                     }
                 }