From 844fc58ad4445511a8bdb15f80f0493ef9ca692b Mon Sep 17 00:00:00 2001 From: "Xavier Pillons (MSFT)" Date: Mon, 9 Oct 2023 12:22:37 +0200 Subject: [PATCH] remove ubuntu 18 support --- .github/workflows/configs/almalinux.yml | 7 --- .github/workflows/configs/centos.yml | 7 --- .github/workflows/configs/images.yml | 8 --- .github/workflows/configs/integration.yml | 7 --- .github/workflows/configs/minimum.yml | 6 -- .github/workflows/main_callable.yml | 2 - .../workflows/z_create_config_callable.yml | 2 - config.tpl.yml | 7 --- docs/deploy/index.md | 7 --- packer/azhop-compute-ubuntu-18_04.json | 57 ------------------- 10 files changed, 110 deletions(-) delete mode 100644 packer/azhop-compute-ubuntu-18_04.json diff --git a/.github/workflows/configs/almalinux.yml b/.github/workflows/configs/almalinux.yml index fd3e09b89..aca409725 100644 --- a/.github/workflows/configs/almalinux.yml +++ b/.github/workflows/configs/almalinux.yml @@ -37,13 +37,6 @@ queues: ColocateNodes: true spot: false EnableAcceleratedNetworking: true - - name: hbv3u18 - vm_size: Standard_HB120rs_v3 - max_core_count: 1200 - image: azhpc:azhop-compute:ubuntu-18_04:latest - ColocateNodes: true - spot: false - EnableAcceleratedNetworking: true - name: hbv3u20 vm_size: Standard_HB120rs_v3 max_core_count: 1200 diff --git a/.github/workflows/configs/centos.yml b/.github/workflows/configs/centos.yml index e6808c4f4..026623920 100644 --- a/.github/workflows/configs/centos.yml +++ b/.github/workflows/configs/centos.yml @@ -43,13 +43,6 @@ queues: ColocateNodes: true spot: false EnableAcceleratedNetworking: true - - name: hbv3u18 - vm_size: Standard_HB120rs_v3 - max_core_count: 1200 - image: azhpc:azhop-compute:ubuntu-18_04:latest - ColocateNodes: true - spot: false - EnableAcceleratedNetworking: true - name: hbv3u20 vm_size: Standard_HB120rs_v3 max_core_count: 1200 diff --git a/.github/workflows/configs/images.yml b/.github/workflows/configs/images.yml index 8efb3b6ee..f7a9506cf 100644 --- a/.github/workflows/configs/images.yml +++ b/.github/workflows/configs/images.yml @@ -36,14 +36,6 @@ images: os_type: Linux version: 7.9 - - name: azhop-compute-ubuntu-1804 - publisher: azhpc - offer: azhop-compute - sku: ubuntu-1804 - hyper_v: V2 - os_type: Linux - version: 18.04 - - name: azhop-compute-almalinux-8_7 publisher: azhpc offer: azhop-compute diff --git a/.github/workflows/configs/integration.yml b/.github/workflows/configs/integration.yml index c519d7f21..ca7217d68 100644 --- a/.github/workflows/configs/integration.yml +++ b/.github/workflows/configs/integration.yml @@ -246,13 +246,6 @@ queues: ColocateNodes: true spot: false EnableAcceleratedNetworking: true - - name: hbv3u18 - vm_size: Standard_HB120rs_v3 - max_core_count: 1200 - image: azhpc:azhop-compute:ubuntu-18_04:latest - ColocateNodes: true - spot: false - EnableAcceleratedNetworking: true - name: hbv3u20 vm_size: Standard_HB120rs_v3 max_core_count: 1200 diff --git a/.github/workflows/configs/minimum.yml b/.github/workflows/configs/minimum.yml index 22c1015fc..3aceb7632 100644 --- a/.github/workflows/configs/minimum.yml +++ b/.github/workflows/configs/minimum.yml @@ -126,12 +126,6 @@ queues: __ALMA8_PLAN__ ColocateNodes: true EnableAcceleratedNetworking: true - - name: hbv3u18 - vm_size: Standard_HB120rs_v3 - max_core_count: 1200 - image: azhpc:azhop-compute:ubuntu-18_04:latest - ColocateNodes: true - EnableAcceleratedNetworking: true - name: hbv3u20 vm_size: Standard_HB120rs_v3 max_core_count: 1200 diff --git a/.github/workflows/main_callable.yml b/.github/workflows/main_callable.yml index 3b2ef2c0d..685715007 100644 --- a/.github/workflows/main_callable.yml +++ b/.github/workflows/main_callable.yml @@ -186,7 +186,6 @@ jobs: sed -i "s|azhpc:azhop-compute:centos-7_9:latest|$SHARED_SIG/azhop-compute-centos-7_9/latest|g" config.yml sed -i "s|azhpc:azhop-desktop:centos-7_9:latest|$SHARED_SIG/azhop-desktop-centos-7_9/latest|g" config.yml sed -i "s|azhpc:azhop-compute:almalinux-8_7:latest|$SHARED_SIG/azhop-compute-almalinux-8_7/latest|g" config.yml - sed -i "s|azhpc:azhop-compute:ubuntu-18_04:latest|$SHARED_SIG/azhop-compute-ubuntu-1804/latest|g" config.yml sed -i "s|azhpc:azhop-compute:ubuntu-20_04:latest|$SHARED_SIG/azhop-compute-ubuntu-2004/latest|g" config.yml sed -i "s|__ALMA8_PLAN__|plan: almalinux:almalinux:8-gen2|g" config.yml @@ -198,7 +197,6 @@ jobs: sed -i "s|azhpc:azhop-compute:centos-7_9:latest|$SIG/azhop-compute-centos-7_9/latest|g" config.yml sed -i "s|azhpc:azhop-desktop:centos-7_9:latest|$SIG/azhop-desktop-centos-7_9/latest|g" config.yml sed -i "s|azhpc:azhop-compute:almalinux-8_7:latest|$SIG/azhop-compute-almalinux-8_7/latest|g" config.yml - sed -i "s|azhpc:azhop-compute:ubuntu-18_04:latest|$SIG/azhop-compute-ubuntu-1804/latest|g" config.yml sed -i "s|azhpc:azhop-compute:ubuntu-20_04:latest|$SIG/azhop-compute-ubuntu-2004/latest|g" config.yml sed -i "s|__ALMA8_PLAN__|plan: almalinux:almalinux:8-gen2|g" config.yml diff --git a/.github/workflows/z_create_config_callable.yml b/.github/workflows/z_create_config_callable.yml index cf1797907..f672fab8b 100644 --- a/.github/workflows/z_create_config_callable.yml +++ b/.github/workflows/z_create_config_callable.yml @@ -182,7 +182,6 @@ jobs: sed -i "s|azhpc:azhop-desktop:centos-7_9:latest|$SHARED_SIG/azhop-desktop-centos-7_9/latest|g" config.yml sed -i "s|azhpc:azhop-compute:almalinux-8_7:latest|$SHARED_SIG/azhop-compute-almalinux-8_7/latest|g" config.yml sed -i "s|azhpc:azhop-desktop:almalinux-8_7:latest|$SHARED_SIG/azhop-desktop-almalinux-8_7/latest|g" config.yml - sed -i "s|azhpc:azhop-compute:ubuntu-18_04:latest|$SHARED_SIG/azhop-compute-ubuntu-1804/latest|g" config.yml sed -i "s|azhpc:azhop-compute:ubuntu-20_04:latest|$SHARED_SIG/azhop-compute-ubuntu-2004/latest|g" config.yml sed -i "s|__ALMA8_PLAN__|plan: almalinux:almalinux-hpc:8_7-hpc-gen2|g" config.yml @@ -195,7 +194,6 @@ jobs: sed -i "s|azhpc:azhop-desktop:centos-7_9:latest|$SIG/azhop-desktop-centos-7_9/latest|g" config.yml sed -i "s|azhpc:azhop-compute:almalinux-8_7:latest|$SIG/azhop-compute-almalinux-8_7/latest|g" config.yml sed -i "s|azhpc:azhop-desktop:almalinux-8_7:latest|$SIG/azhop-desktop-almalinux-8_7/latest|g" config.yml - sed -i "s|azhpc:azhop-compute:ubuntu-18_04:latest|$SIG/azhop-compute-ubuntu-1804/latest|g" config.yml sed -i "s|azhpc:azhop-compute:ubuntu-20_04:latest|$SIG/azhop-compute-ubuntu-2004/latest|g" config.yml sed -i "s|__ALMA8_PLAN__|plan: almalinux:almalinux-hpc:8_7-hpc-gen2|g" config.yml diff --git a/config.tpl.yml b/config.tpl.yml index c6ae425a8..9b1f342cf 100644 --- a/config.tpl.yml +++ b/config.tpl.yml @@ -419,13 +419,6 @@ images: hyper_v: V2 os_type: Linux version: 7.9 - - name: azhop-compute-ubuntu-18_04 - publisher: azhpc - offer: azhop-compute - sku: ubuntu-1804 - hyper_v: V2 - os_type: Linux - version: 18.04 - name: azhop-desktop-ubuntu-20_04 publisher: azhpc offer: azhop-desktop diff --git a/docs/deploy/index.md b/docs/deploy/index.md index 50525a5b2..7226fadae 100644 --- a/docs/deploy/index.md +++ b/docs/deploy/index.md @@ -776,13 +776,6 @@ images: hyper_v: V2 os_type: Linux version: 7.9 - - name: azhop-compute-ubuntu-1804 - publisher: azhpc - offer: azhop-compute - sku: ubuntu-1804 - hyper_v: V2 - os_type: Linux - version: 18.04 - name: azhop-win10 publisher: azhop offer: Windows-10 diff --git a/packer/azhop-compute-ubuntu-18_04.json b/packer/azhop-compute-ubuntu-18_04.json deleted file mode 100644 index 29573e48d..000000000 --- a/packer/azhop-compute-ubuntu-18_04.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "builders": [ - { - "type": "azure-arm", - "use_azure_cli_auth": "{{user `var_use_azure_cli_auth`}}", - "image_publisher": "microsoft-dsvm", - "image_offer": "ubuntu-hpc", - "image_sku": "1804", - "image_version": "latest", - "managed_image_resource_group_name": "{{user `var_resource_group`}}", - "managed_image_name": "{{user `var_image`}}", - "os_type": "Linux", - "vm_size": "Standard_d8s_v3", - "managed_image_storage_account_type": "Premium_LRS", - "keep_os_disk": "{{user `var_keep_os_disk`}}", - "temp_os_disk_name": "{{user `var_image`}}", - "ssh_pty": "true", - "build_resource_group_name": "{{user `var_resource_group`}}", - "private_virtual_network_with_public_ip": "{{user `var_private_virtual_network_with_public_ip`}}", - "virtual_network_name": "{{user `var_virtual_network_name`}}", - "virtual_network_subnet_name": "{{user `var_virtual_network_subnet_name`}}", - "virtual_network_resource_group_name": "{{user `var_virtual_network_resource_group_name`}}", - "cloud_environment_name": "{{user `var_cloud_env`}}", - "ssh_bastion_host": "{{user `var_ssh_bastion_host`}}", - "ssh_bastion_port": "{{user `var_ssh_bastion_port`}}", - "ssh_bastion_username": "{{user `var_ssh_bastion_username`}}", - "ssh_bastion_private_key_file": "{{user `var_ssh_bastion_private_key_file`}}" - } - ], - "provisioners": [ - { - "type": "file", - "source": "scripts/ubuntu/", - "destination": "/tmp" - }, - { - "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} sudo -E sh '{{ .Path }}'", - "inline": [ - "chmod +x /tmp/*.sh", - "/tmp/linux-setup.sh || exit 1", - "/tmp/infiniband.sh || exit 1", - "/tmp/openpbs.sh || exit 1", - "/tmp/slurm.sh || exit 1", - "/tmp/telegraf.sh || exit 1", - "/tmp/zz-compute-custom.sh || exit 1", - "echo ' This is the end '", - "rm -rf /tmp/*.sh", - "/usr/sbin/waagent -force -deprovision+user", - "sed -i 's/^send host-name =.*/send host-name = \"\"/' /etc/dhcp/dhclient.conf", - "export HISTSIZE=0 && sync" - ], - "inline_shebang": "/bin/sh -x", - "type": "shell", - "skip_clean": true - } - ] -}