feat: windows hpc base image

Signed-off-by: Evan Baker <rbtr@users.noreply.github.com>
Azure · Nov 6, 2024 · ecb6a4e · ecb6a4e
1 parent b5a7f14
commit ecb6a4e
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 168 deletions.
diff --git a/.pipelines/containers/container-template.steps.yaml b/.pipelines/containers/container-template.steps.yaml
@@ -2,7 +2,6 @@ parameters:
   arch: ""
   name: ""
   os: ""
-  os_version: ""
 
 steps:
 - task: AzureCLI@2
@@ -17,7 +16,7 @@ steps:
 - script: |
     set -e
     if [ "$IN_OS" = 'windows' ]; then export BUILDX_ACTION='--push'; fi
-    make "$IMGNAME" OS="$IN_OS" ARCH="$IN_ARCH" OS_VERSION="$IN_OS_VERSION"
+    make "$IMGNAME" OS="$IN_OS" ARCH="$IN_ARCH" 
   name: image_build
   displayName: Image Build
   workingDirectory: $(ACN_DIR)
@@ -26,7 +25,6 @@ steps:
     IMGNAME: '${{ parameters.name }}-image'
     IN_OS: '${{ parameters.os }}'
     IN_ARCH: '${{ parameters.arch }}'
-    IN_OS_VERSION: '${{ parameters.os_version }}'
 
 - task: AzureCLI@2
   displayName: "Logout"

diff --git a/.pipelines/containers/container-template.yaml b/.pipelines/containers/container-template.yaml
@@ -2,7 +2,6 @@ parameters:
   arch: ""
   name: ""
   os: ""
-  os_version: ""
 
 steps:
 - task: AzureCLI@2
@@ -17,7 +16,7 @@ steps:
 - script: |
     set -e
     if [ ${{ parameters.os }} = 'windows' ]; then export BUILDX_ACTION='--push'; fi
-    make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }}
+    make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }}
   name: image_build
   displayName: Image Build
   retryCountOnTaskFailure: 3

diff --git a/.pipelines/containers/manifest-template.steps.yaml b/.pipelines/containers/manifest-template.steps.yaml
@@ -1,7 +1,6 @@
 parameters:
   name: ""
   platforms: ""
-  os_versions: ""
 
 steps:
 
@@ -16,7 +15,7 @@ steps:
 
   - script: |
       set -e
-      make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}" OS_VERSIONS="${{ parameters.os_versions }}"
+      make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}"
     workingDirectory: $(ACN_DIR)
     name: manifest_build
     displayName: Manifest Build

diff --git a/.pipelines/containers/manifest-template.yaml b/.pipelines/containers/manifest-template.yaml
@@ -1,7 +1,6 @@
 parameters:
   name: ""
   platforms: ""
-  os_versions: ""
 
 steps:
 
@@ -16,7 +15,7 @@ steps:
 
   - script: |
       set -e
-      make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}" OS_VERSIONS="${{ parameters.os_versions }}"
+      make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}" 
     name: manifest_build
     displayName: Manifest Build
     retryCountOnTaskFailure: 3

diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -110,54 +110,26 @@ stages:
                 arch: amd64
                 name: azure-ipam
                 os: linux
-              azure_ipam_windows2019_amd64:
+              azure_ipam_windows:
                 arch: amd64
                 name: azure-ipam
                 os: windows
-                os_version: ltsc2019
-              azure_ipam_windows2022_amd64:
-                arch: amd64
-                name: azure-ipam
-                os: windows
-                os_version: ltsc2022
               cni_linux_amd64:
                 arch: amd64
                 name: cni
                 os: linux
-              cni_windows2019_amd64:
-                arch: amd64
-                name: cni
-                os: windows
-                os_version: ltsc2019
-              cni_windows2022_amd64:
+              cni_windows_amd64:
                 arch: amd64
                 name: cni
                 os: windows
-                os_version: ltsc2022
-              cni_windows2025_amd64:
-                arch: amd64
-                name: cni
-                os: windows
-                os_version: ltsc2025
               cns_linux_amd64:
                 arch: amd64
                 name: cns
                 os: linux
-              cns_windows2019_amd64:
-                arch: amd64
-                name: cns
-                os: windows
-                os_version: ltsc2019
-              cns_windows2022_amd64:
-                arch: amd64
-                name: cns
-                os: windows
-                os_version: ltsc2022
-              cns_windows2025_amd64:
+              cns_windows_amd64:
                 arch: amd64
                 name: cns
                 os: windows
-                os_version: ltsc2025
               ipv6_hp_bpf_linux_amd64:
                 arch: amd64
                 name: ipv6-hp-bpf
@@ -166,11 +138,10 @@ stages:
                 arch: amd64
                 name: npm
                 os: linux
-              npm_windows2022_amd64:
+              npm_windows_amd64:
                 arch: amd64
                 name: npm
                 os: windows
-                os_version: ltsc2022
           steps:
             - template: containers/container-template.yaml
               parameters:
@@ -226,28 +197,23 @@ stages:
             matrix:
               azure_ipam:
                 name: azure-ipam
-                os_versions: ltsc2019 ltsc2022
                 platforms: linux/amd64 linux/arm64 windows/amd64
               cni:
                 name: cni
-                os_versions: ltsc2019 ltsc2022 ltsc2025
                 platforms: linux/amd64 linux/arm64 windows/amd64
               cns:
                 name: cns
-                os_versions: ltsc2019 ltsc2022 ltsc2025
                 platforms: linux/amd64 linux/arm64 windows/amd64
               ipv6_hp_bpf:
                 name: ipv6-hp-bpf
                 platforms: linux/amd64 linux/arm64
               npm:
                 name: npm
-                os_versions: ltsc2022
                 platforms: linux/amd64 linux/arm64 windows/amd64
           steps:
             - template: containers/manifest-template.yaml
               parameters:
                 name: $(name)
-                os_versions: $(os_versions)
                 platforms: $(platforms)
 
     # Cilium Podsubnet E2E tests

diff --git a/.pipelines/run-pipeline.yaml b/.pipelines/run-pipeline.yaml
@@ -122,64 +122,31 @@ stages:
                 arch: amd64
                 name: azure-ipam
                 os: linux
-              azure_ipam_windows2019_amd64:
-                Suffix: azure_ipam_windows2019_amd64
+              azure_ipam_windows_amd64:
+                Suffix: azure_ipam_windows_amd64
                 arch: amd64
                 name: azure-ipam
                 os: windows
-                os_version: ltsc2019
-              azure_ipam_windows2022_amd64:
-                Suffix: azure_ipam_windows2022_amd64
-                arch: amd64
-                name: azure-ipam
-                os: windows
-                os_version: ltsc2022
               cni_linux_amd64:
                 Suffix: cni_linux_amd64
                 arch: amd64
                 name: cni
                 os: linux
-              cni_windows2019_amd64:
-                Suffix: cni_windows2019_amd64
-                arch: amd64
-                name: cni
-                os: windows
-                os_version: ltsc2019
-              cni_windows2022_amd64:
-                Suffix: cni_windows2022_amd64
+              cni_windows_amd64:
+                Suffix: cni_windows_amd64
                 arch: amd64
                 name: cni
                 os: windows
-                os_version: ltsc2022
-              cni_windows2025_amd64:
-                Suffix: cni_windows2025_amd64
-                arch: amd64
-                name: cni
-                os: windows
-                os_version: ltsc2025
               cns_linux_amd64:
                 Suffix: cns_linux_amd64
                 arch: amd64
                 name: cns
                 os: linux
-              cns_windows2019_amd64:
-                Suffix: cns_windows2019_amd64
-                arch: amd64
-                name: cns
-                os: windows
-                os_version: ltsc2019
-              cns_windows2022_amd64:
-                Suffix: cns_windows2022_amd64
-                arch: amd64
-                name: cns
-                os: windows
-                os_version: ltsc2022
-              cns_windows2025_amd64:
-                Suffix: cns_windows2025_amd64
+              cns_windows_amd64:
+                Suffix: cns_windows_amd64
                 arch: amd64
                 name: cns
                 os: windows
-                os_version: ltsc2025
               ipv6_hp_bpf_linux_amd64:
                 Suffix: ipv6_hp_bpf_linux_amd64
                 arch: amd64
@@ -190,12 +157,11 @@ stages:
                 arch: amd64
                 name: npm
                 os: linux
-              npm_windows2022_amd64:
-                Suffix: npm_windows2022_amd64
+              npm_windows_amd64:
+                Suffix: npm_windows_amd64
                 arch: amd64
                 name: npm
                 os: windows
-                os_version: ltsc2022
           variables:
             ob_git_checkout: true
             ob_artifactSuffix: $(Suffix) # this is needed to not collide published artifact containers
@@ -209,7 +175,6 @@ stages:
                 arch: $(arch)
                 name: $(name)
                 os: $(os)
-                os_version: $(os_version)
 
         - job: containerize_linux_arm64
           displayName: Build Images
@@ -280,17 +245,14 @@ stages:
             matrix:
               azure_ipam:
                 name: azure-ipam
-                os_versions: ltsc2019 ltsc2022
                 platforms: linux/amd64 linux/arm64 windows/amd64
                 Suffix: azure-ipam
               cni:
                 name: cni
-                os_versions: ltsc2019 ltsc2022 ltsc2025
                 platforms: linux/amd64 linux/arm64 windows/amd64
                 Suffix: cni
               cns:
                 name: cns
-                os_versions: ltsc2019 ltsc2022 ltsc2025
                 platforms: linux/amd64 linux/arm64 windows/amd64
                 Suffix: cns
               ipv6_hp_bpf:
@@ -299,7 +261,6 @@ stages:
                 Suffix: ipv6-hp-bpf
               npm:
                 name: npm
-                os_versions: ltsc2022
                 platforms: linux/amd64 linux/arm64 windows/amd64
                 Suffix: npm
           variables:
@@ -317,7 +278,6 @@ stages:
             - template: containers/manifest-template.steps.yaml@ACNTools
               parameters:
                 name: $(name)
-                os_versions: $(os_versions)
                 platforms: $(platforms)
 
     # Cilium Podsubnet E2E tests