From c046af8f08881b4df955e466aeb29b451ab0f142 Mon Sep 17 00:00:00 2001 From: Loic Devulder Date: Fri, 18 Aug 2023 16:10:23 +0200 Subject: [PATCH 1/5] ci: bump K3s/RKE2 versions Signed-off-by: Loic Devulder --- .github/workflows/cli-k3s-hardened-rancher_latest.yaml | 2 +- .github/workflows/cli-k3s-hardened-rancher_stable.yaml | 2 +- .github/workflows/cli-k3s-obs_dev.yaml | 2 +- .github/workflows/cli-k3s-obs_stable.yaml | 2 +- .github/workflows/cli-k3s-obs_staging.yaml | 2 +- .github/workflows/cli-k3s-os-upgrade-rancher_latest.yaml | 2 +- .github/workflows/cli-k3s-os-upgrade-rancher_stable.yaml | 2 +- .github/workflows/cli-k3s-os-upgrade.yaml | 2 +- .github/workflows/cli-k3s-rancher_latest.yaml | 2 +- .github/workflows/cli-k3s-rancher_stable.yaml | 2 +- .github/workflows/cli-k3s-sequential-rancher_latest.yaml | 2 +- .github/workflows/cli-k3s-sequential-rancher_stable.yaml | 2 +- .github/workflows/cli-obs-manual-workflow.yaml | 2 +- .github/workflows/cli-rke2-hardened-rancher_latest.yaml | 4 ++-- .github/workflows/cli-rke2-hardened-rancher_stable.yaml | 4 ++-- .github/workflows/cli-rke2-obs_dev.yaml | 4 ++-- .github/workflows/cli-rke2-obs_stable.yaml | 4 ++-- .github/workflows/cli-rke2-obs_staging.yaml | 4 ++-- .github/workflows/cli-rke2-os-upgrade-rancher_latest.yaml | 4 ++-- .github/workflows/cli-rke2-os-upgrade-rancher_stable.yaml | 4 ++-- .github/workflows/cli-rke2-os-upgrade.yaml | 4 ++-- .github/workflows/cli-rke2-rancher_latest.yaml | 4 ++-- .github/workflows/cli-rke2-rancher_stable.yaml | 4 ++-- .github/workflows/cli-rke2-scalability-rancher_stable.yaml | 4 ++-- .github/workflows/cli-rke2-sequential-rancher_latest.yaml | 4 ++-- .github/workflows/cli-rke2-sequential-rancher_stable.yaml | 4 ++-- .github/workflows/master-e2e.yaml | 2 +- .github/workflows/ui-k3s-obs_dev.yaml | 2 +- .github/workflows/ui-k3s-obs_stable.yaml | 2 +- .github/workflows/ui-k3s-obs_staging.yaml | 2 +- .github/workflows/ui-k3s-os-upgrade-rancher_latest.yaml | 2 +- .github/workflows/ui-k3s-os-upgrade-rancher_stable.yaml | 2 +- .github/workflows/ui-k3s-os-upgrade.yaml | 2 +- .github/workflows/ui-k3s-rancher_latest.yaml | 2 +- .github/workflows/ui-k3s-rancher_stable.yaml | 2 +- .github/workflows/ui-obs-manual-workflow.yaml | 2 +- .github/workflows/ui-rke2-obs_dev.yaml | 4 ++-- .github/workflows/ui-rke2-obs_stable.yaml | 4 ++-- .github/workflows/ui-rke2-obs_staging.yaml | 4 ++-- .github/workflows/ui-rke2-os-upgrade-rancher_latest.yaml | 4 ++-- .github/workflows/ui-rke2-os-upgrade-rancher_stable.yaml | 4 ++-- .github/workflows/ui-rke2-os-upgrade.yaml | 4 ++-- .github/workflows/ui-rke2-rancher_latest.yaml | 4 ++-- .github/workflows/ui-rke2-rancher_stable.yaml | 4 ++-- 44 files changed, 65 insertions(+), 65 deletions(-) diff --git a/.github/workflows/cli-k3s-hardened-rancher_latest.yaml b/.github/workflows/cli-k3s-hardened-rancher_latest.yaml index a863ec46e..a25f416de 100644 --- a/.github/workflows/cli-k3s-hardened-rancher_latest.yaml +++ b/.github/workflows/cli-k3s-hardened-rancher_latest.yaml @@ -17,6 +17,6 @@ jobs: cert-manager_version: v1.11.1 cluster_name: cluster-k3s cluster_type: hardened - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 node_number: 3 rancher_version: latest/devel diff --git a/.github/workflows/cli-k3s-hardened-rancher_stable.yaml b/.github/workflows/cli-k3s-hardened-rancher_stable.yaml index a87076127..7743b46e8 100644 --- a/.github/workflows/cli-k3s-hardened-rancher_stable.yaml +++ b/.github/workflows/cli-k3s-hardened-rancher_stable.yaml @@ -17,5 +17,5 @@ jobs: cert-manager_version: v1.11.1 cluster_name: cluster-k3s cluster_type: hardened - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 node_number: 3 diff --git a/.github/workflows/cli-k3s-obs_dev.yaml b/.github/workflows/cli-k3s-obs_dev.yaml index ab86af490..1737ebdc5 100644 --- a/.github/workflows/cli-k3s-obs_dev.yaml +++ b/.github/workflows/cli-k3s-obs_dev.yaml @@ -39,6 +39,6 @@ jobs: cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/cli-k3s-obs_stable.yaml b/.github/workflows/cli-k3s-obs_stable.yaml index 6689ac667..780f1d90a 100644 --- a/.github/workflows/cli-k3s-obs_stable.yaml +++ b/.github/workflows/cli-k3s-obs_stable.yaml @@ -39,6 +39,6 @@ jobs: cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/cli-k3s-obs_staging.yaml b/.github/workflows/cli-k3s-obs_staging.yaml index db6ba694b..e7d95a4af 100644 --- a/.github/workflows/cli-k3s-obs_staging.yaml +++ b/.github/workflows/cli-k3s-obs_staging.yaml @@ -39,6 +39,6 @@ jobs: cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/cli-k3s-os-upgrade-rancher_latest.yaml b/.github/workflows/cli-k3s-os-upgrade-rancher_latest.yaml index cfa012d89..e95d46a5e 100644 --- a/.github/workflows/cli-k3s-os-upgrade-rancher_latest.yaml +++ b/.github/workflows/cli-k3s-os-upgrade-rancher_latest.yaml @@ -19,7 +19,7 @@ jobs: test_description: "CI - CLI - Parallel - OS Upgrade test with Standard K3s" cluster_name: cluster-k3s iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 node_number: 5 operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher diff --git a/.github/workflows/cli-k3s-os-upgrade-rancher_stable.yaml b/.github/workflows/cli-k3s-os-upgrade-rancher_stable.yaml index a01985861..c01de2f02 100644 --- a/.github/workflows/cli-k3s-os-upgrade-rancher_stable.yaml +++ b/.github/workflows/cli-k3s-os-upgrade-rancher_stable.yaml @@ -19,7 +19,7 @@ jobs: test_description: "CI - CLI - Parallel - OS Upgrade test with Standard K3s" cluster_name: cluster-k3s iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 node_number: 5 operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher diff --git a/.github/workflows/cli-k3s-os-upgrade.yaml b/.github/workflows/cli-k3s-os-upgrade.yaml index b4e0e27fb..0852d439c 100644 --- a/.github/workflows/cli-k3s-os-upgrade.yaml +++ b/.github/workflows/cli-k3s-os-upgrade.yaml @@ -47,7 +47,7 @@ jobs: cluster_name: cluster-k3s destroy_runner: ${{ inputs.destroy_runner }} iso_to_test: ${{ inputs.iso_to_test }} - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 node_number: 5 operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher diff --git a/.github/workflows/cli-k3s-rancher_latest.yaml b/.github/workflows/cli-k3s-rancher_latest.yaml index b9da5c07d..a4f812ae4 100644 --- a/.github/workflows/cli-k3s-rancher_latest.yaml +++ b/.github/workflows/cli-k3s-rancher_latest.yaml @@ -18,5 +18,5 @@ jobs: with: test_description: "CI - CLI - Parallel - Deployment test with Standard K3s" cluster_name: cluster-k3s - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 rancher_version: latest/devel diff --git a/.github/workflows/cli-k3s-rancher_stable.yaml b/.github/workflows/cli-k3s-rancher_stable.yaml index fc3716aaa..172e105e2 100644 --- a/.github/workflows/cli-k3s-rancher_stable.yaml +++ b/.github/workflows/cli-k3s-rancher_stable.yaml @@ -20,6 +20,6 @@ jobs: with: test_description: "CI - CLI - Parallel - Deployment test with Standard K3s" cluster_name: cluster-k3s - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 start_condition: ${{ github.event.workflow_run.conclusion }} workflow_download: ${{ github.event.workflow_run.workflow_id }} diff --git a/.github/workflows/cli-k3s-sequential-rancher_latest.yaml b/.github/workflows/cli-k3s-sequential-rancher_latest.yaml index c72628ecf..b3a87c2ef 100644 --- a/.github/workflows/cli-k3s-sequential-rancher_latest.yaml +++ b/.github/workflows/cli-k3s-sequential-rancher_latest.yaml @@ -19,6 +19,6 @@ jobs: with: test_description: "CI/Manual - CLI - Sequential - Deployment test with Standard K3s" cluster_name: cluster-k3s - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 rancher_version: latest/devel sequential: true diff --git a/.github/workflows/cli-k3s-sequential-rancher_stable.yaml b/.github/workflows/cli-k3s-sequential-rancher_stable.yaml index 14d23cd43..d06405a47 100644 --- a/.github/workflows/cli-k3s-sequential-rancher_stable.yaml +++ b/.github/workflows/cli-k3s-sequential-rancher_stable.yaml @@ -19,6 +19,6 @@ jobs: with: test_description: "CI/Manual - CLI - Sequential - Deployment test with Standard K3s" cluster_name: cluster-k3s - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 rancher_version: stable/latest sequential: true diff --git a/.github/workflows/cli-obs-manual-workflow.yaml b/.github/workflows/cli-obs-manual-workflow.yaml index 2a82c37b2..0ffc86fc1 100644 --- a/.github/workflows/cli-obs-manual-workflow.yaml +++ b/.github/workflows/cli-obs-manual-workflow.yaml @@ -17,7 +17,7 @@ on: type: string k8s_version_to_provision: description: Version of K8s to deploy on the cluster (only K3s or RKE2 are supported) - default: v1.25.7+k3s1 + default: v1.26.7+k3s1 type: string node_number: description: Number of nodes (>3) to deploy on the provisioned cluster diff --git a/.github/workflows/cli-rke2-hardened-rancher_latest.yaml b/.github/workflows/cli-rke2-hardened-rancher_latest.yaml index ae98369d9..9217f80d1 100644 --- a/.github/workflows/cli-rke2-hardened-rancher_latest.yaml +++ b/.github/workflows/cli-rke2-hardened-rancher_latest.yaml @@ -17,7 +17,7 @@ jobs: ca_type: private cluster_name: cluster-rke2 cluster_type: hardened - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 node_number: 3 rancher_version: latest/devel - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-hardened-rancher_stable.yaml b/.github/workflows/cli-rke2-hardened-rancher_stable.yaml index b8075f12e..359171050 100644 --- a/.github/workflows/cli-rke2-hardened-rancher_stable.yaml +++ b/.github/workflows/cli-rke2-hardened-rancher_stable.yaml @@ -17,6 +17,6 @@ jobs: ca_type: private cluster_name: cluster-rke2 cluster_type: hardened - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 node_number: 3 - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-obs_dev.yaml b/.github/workflows/cli-rke2-obs_dev.yaml index 9fa16a0c3..61b4e20d2 100644 --- a/.github/workflows/cli-rke2-obs_dev.yaml +++ b/.github/workflows/cli-rke2-obs_dev.yaml @@ -40,7 +40,7 @@ jobs: cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher rancher_version: ${{ inputs.rancher_version }} - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-obs_stable.yaml b/.github/workflows/cli-rke2-obs_stable.yaml index 94fd6338d..02a9b5cce 100644 --- a/.github/workflows/cli-rke2-obs_stable.yaml +++ b/.github/workflows/cli-rke2-obs_stable.yaml @@ -40,7 +40,7 @@ jobs: cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher rancher_version: ${{ inputs.rancher_version }} - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-obs_staging.yaml b/.github/workflows/cli-rke2-obs_staging.yaml index 6e81da59f..c7145c4b3 100644 --- a/.github/workflows/cli-rke2-obs_staging.yaml +++ b/.github/workflows/cli-rke2-obs_staging.yaml @@ -40,7 +40,7 @@ jobs: cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher rancher_version: ${{ inputs.rancher_version }} - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-os-upgrade-rancher_latest.yaml b/.github/workflows/cli-rke2-os-upgrade-rancher_latest.yaml index 544de7aab..c24527441 100644 --- a/.github/workflows/cli-rke2-os-upgrade-rancher_latest.yaml +++ b/.github/workflows/cli-rke2-os-upgrade-rancher_latest.yaml @@ -20,7 +20,7 @@ jobs: ca_type: private cluster_name: cluster-rke2 iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 node_number: 5 operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher @@ -28,4 +28,4 @@ jobs: upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal-channel:latest upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal/5.4:latest upgrade_os_channel: latest-dev - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-os-upgrade-rancher_stable.yaml b/.github/workflows/cli-rke2-os-upgrade-rancher_stable.yaml index 801188569..1669ec18c 100644 --- a/.github/workflows/cli-rke2-os-upgrade-rancher_stable.yaml +++ b/.github/workflows/cli-rke2-os-upgrade-rancher_stable.yaml @@ -20,7 +20,7 @@ jobs: ca_type: private cluster_name: cluster-rke2 iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 node_number: 5 operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher @@ -29,4 +29,4 @@ jobs: upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal-channel:latest upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal/5.4:latest upgrade_os_channel: latest-dev - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-os-upgrade.yaml b/.github/workflows/cli-rke2-os-upgrade.yaml index 7f7084b11..5816a0e04 100644 --- a/.github/workflows/cli-rke2-os-upgrade.yaml +++ b/.github/workflows/cli-rke2-os-upgrade.yaml @@ -48,7 +48,7 @@ jobs: cluster_name: cluster-rke2 destroy_runner: ${{ inputs.destroy_runner }} iso_to_test: ${{ inputs.iso_to_test }} - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 node_number: 5 operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher @@ -57,4 +57,4 @@ jobs: upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal-channel:latest upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal/5.4:latest upgrade_os_channel: ${{ inputs.upgrade_os_channel }} - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-rancher_latest.yaml b/.github/workflows/cli-rke2-rancher_latest.yaml index a9916b755..930e8d6b9 100644 --- a/.github/workflows/cli-rke2-rancher_latest.yaml +++ b/.github/workflows/cli-rke2-rancher_latest.yaml @@ -19,6 +19,6 @@ jobs: test_description: "CI - CLI - Parallel - Deployment test with Standard RKE2" ca_type: private cluster_name: cluster-rke2 - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 rancher_version: latest/devel - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-rancher_stable.yaml b/.github/workflows/cli-rke2-rancher_stable.yaml index 476c9b7ce..914b3efa4 100644 --- a/.github/workflows/cli-rke2-rancher_stable.yaml +++ b/.github/workflows/cli-rke2-rancher_stable.yaml @@ -21,7 +21,7 @@ jobs: test_description: "CI - CLI - Parallel - Deployment test with Standard RKE2" ca_type: private cluster_name: cluster-rke2 - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 start_condition: ${{ github.event.workflow_run.conclusion }} workflow_download: ${{ github.event.workflow_run.workflow_id }} - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-scalability-rancher_stable.yaml b/.github/workflows/cli-rke2-scalability-rancher_stable.yaml index d86057428..8381dc29b 100644 --- a/.github/workflows/cli-rke2-scalability-rancher_stable.yaml +++ b/.github/workflows/cli-rke2-scalability-rancher_stable.yaml @@ -21,8 +21,8 @@ jobs: test_description: "CI/Manual - CLI - Scalability - Deployment test with Standard RKE2" ca_type: private cluster_name: cluster-rke2 - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 node_number: 60 rancher_version: stable/latest runner_template: elemental-e2e-ci-runner-spot-x86-64-template-n2-highmem-64-v4 - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-sequential-rancher_latest.yaml b/.github/workflows/cli-rke2-sequential-rancher_latest.yaml index 84f2bfd18..41bce9ee0 100644 --- a/.github/workflows/cli-rke2-sequential-rancher_latest.yaml +++ b/.github/workflows/cli-rke2-sequential-rancher_latest.yaml @@ -20,7 +20,7 @@ jobs: test_description: "CI/Manual - CLI - Sequential - Deployment test with Standard RKE2" ca_type: private cluster_name: cluster-rke2 - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 rancher_version: latest/devel sequential: true - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/cli-rke2-sequential-rancher_stable.yaml b/.github/workflows/cli-rke2-sequential-rancher_stable.yaml index fe3dc39be..1150ab95e 100644 --- a/.github/workflows/cli-rke2-sequential-rancher_stable.yaml +++ b/.github/workflows/cli-rke2-sequential-rancher_stable.yaml @@ -20,7 +20,7 @@ jobs: test_description: "CI/Manual - CLI - Sequential - Deployment test with Standard RKE2" ca_type: private cluster_name: cluster-rke2 - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 rancher_version: stable/latest sequential: true - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/master-e2e.yaml b/.github/workflows/master-e2e.yaml index 76444c8f9..d2ac98d9b 100644 --- a/.github/workflows/master-e2e.yaml +++ b/.github/workflows/master-e2e.yaml @@ -136,7 +136,7 @@ on: type: string upstream_cluster_version: description: Cluster upstream version where to install Rancher (K3s or RKE2) - default: v1.25.7+k3s1 + default: v1.26.7+k3s1 type: string workflow_download: description: build-ci workfluw to use for artifacts diff --git a/.github/workflows/ui-k3s-obs_dev.yaml b/.github/workflows/ui-k3s-obs_dev.yaml index 08eec48c7..4f55c4495 100644 --- a/.github/workflows/ui-k3s-obs_dev.yaml +++ b/.github/workflows/ui-k3s-obs_dev.yaml @@ -37,7 +37,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: dev iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher proxy: ${{ inputs.proxy }} rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/ui-k3s-obs_stable.yaml b/.github/workflows/ui-k3s-obs_stable.yaml index a4a27acbe..3a6fd2922 100644 --- a/.github/workflows/ui-k3s-obs_stable.yaml +++ b/.github/workflows/ui-k3s-obs_stable.yaml @@ -41,7 +41,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: ${{ inputs.elemental_ui_version }} iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher proxy: ${{ inputs.proxy }} rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/ui-k3s-obs_staging.yaml b/.github/workflows/ui-k3s-obs_staging.yaml index 60b0bdc30..57f9f2381 100644 --- a/.github/workflows/ui-k3s-obs_staging.yaml +++ b/.github/workflows/ui-k3s-obs_staging.yaml @@ -37,7 +37,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: dev iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher proxy: ${{ inputs.proxy }} rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/ui-k3s-os-upgrade-rancher_latest.yaml b/.github/workflows/ui-k3s-os-upgrade-rancher_latest.yaml index eb1521ea9..48ffdb62c 100644 --- a/.github/workflows/ui-k3s-os-upgrade-rancher_latest.yaml +++ b/.github/workflows/ui-k3s-os-upgrade-rancher_latest.yaml @@ -39,7 +39,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner || true }} elemental_ui_version: dev iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 proxy: ${{ inputs.proxy || 'elemental' }} rancher_version: ${{ inputs.rancher_version || 'latest/devel' }} test_type: ui diff --git a/.github/workflows/ui-k3s-os-upgrade-rancher_stable.yaml b/.github/workflows/ui-k3s-os-upgrade-rancher_stable.yaml index fdaa80e4b..9bfee86af 100644 --- a/.github/workflows/ui-k3s-os-upgrade-rancher_stable.yaml +++ b/.github/workflows/ui-k3s-os-upgrade-rancher_stable.yaml @@ -32,7 +32,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner || true }} elemental_ui_version: dev iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Stable:/Teal53/media/iso/elemental-teal.x86_64.iso - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher proxy: ${{ inputs.proxy || 'elemental' }} rancher_version: ${{ inputs.rancher_version || 'stable/latest' }} diff --git a/.github/workflows/ui-k3s-os-upgrade.yaml b/.github/workflows/ui-k3s-os-upgrade.yaml index da2cac221..d150e0408 100644 --- a/.github/workflows/ui-k3s-os-upgrade.yaml +++ b/.github/workflows/ui-k3s-os-upgrade.yaml @@ -48,7 +48,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: dev iso_to_test: ${{ inputs.iso_to_test }} - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 operator_repo: ${{ inputs.operator_repo }} proxy: ${{ inputs.proxy }} rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/ui-k3s-rancher_latest.yaml b/.github/workflows/ui-k3s-rancher_latest.yaml index 86056ae76..122d03132 100644 --- a/.github/workflows/ui-k3s-rancher_latest.yaml +++ b/.github/workflows/ui-k3s-rancher_latest.yaml @@ -32,7 +32,7 @@ jobs: cypress_tags: main destroy_runner: ${{ inputs.destroy_runner || true }} elemental_ui_version: dev - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 proxy: ${{ inputs.proxy || 'elemental' }} rancher_version: ${{ inputs.rancher_version || 'latest/devel' }} test_type: ui diff --git a/.github/workflows/ui-k3s-rancher_stable.yaml b/.github/workflows/ui-k3s-rancher_stable.yaml index df24d77a9..435256a20 100644 --- a/.github/workflows/ui-k3s-rancher_stable.yaml +++ b/.github/workflows/ui-k3s-rancher_stable.yaml @@ -32,7 +32,7 @@ jobs: cypress_tags: main destroy_runner: ${{ inputs.destroy_runner || true }} elemental_ui_version: dev - k8s_version_to_provision: v1.25.7+k3s1 + k8s_version_to_provision: v1.26.7+k3s1 proxy: ${{ inputs.proxy || 'elemental' }} rancher_version: ${{ inputs.rancher_version || 'stable/latest' }} test_type: ui diff --git a/.github/workflows/ui-obs-manual-workflow.yaml b/.github/workflows/ui-obs-manual-workflow.yaml index 56fd2d44e..65544cd7e 100644 --- a/.github/workflows/ui-obs-manual-workflow.yaml +++ b/.github/workflows/ui-obs-manual-workflow.yaml @@ -21,7 +21,7 @@ on: type: string k8s_version_to_provision: description: Version of K8s to deploy on the cluster (only K3s or RKE2 are supported) - default: v1.25.7+k3s1 + default: v1.26.7+k3s1 type: string operator_repo: description: Elemental operator repository to use diff --git a/.github/workflows/ui-rke2-obs_dev.yaml b/.github/workflows/ui-rke2-obs_dev.yaml index 1eac68579..eac5c8818 100644 --- a/.github/workflows/ui-rke2-obs_dev.yaml +++ b/.github/workflows/ui-rke2-obs_dev.yaml @@ -35,8 +35,8 @@ jobs: destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: dev iso_boot: true - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher rancher_version: ${{ inputs.rancher_version }} test_type: ui - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/ui-rke2-obs_stable.yaml b/.github/workflows/ui-rke2-obs_stable.yaml index 1c87e9144..da1b3148a 100644 --- a/.github/workflows/ui-rke2-obs_stable.yaml +++ b/.github/workflows/ui-rke2-obs_stable.yaml @@ -39,8 +39,8 @@ jobs: destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: ${{ inputs.elemental_ui_version }} iso_boot: true - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/stable/charts/rancher rancher_version: ${{ inputs.rancher_version }} test_type: ui - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/ui-rke2-obs_staging.yaml b/.github/workflows/ui-rke2-obs_staging.yaml index 0808a47d3..7d916bbd3 100644 --- a/.github/workflows/ui-rke2-obs_staging.yaml +++ b/.github/workflows/ui-rke2-obs_staging.yaml @@ -35,8 +35,8 @@ jobs: destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: dev iso_boot: true - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher rancher_version: ${{ inputs.rancher_version }} test_type: ui - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/ui-rke2-os-upgrade-rancher_latest.yaml b/.github/workflows/ui-rke2-os-upgrade-rancher_latest.yaml index 2ddb7a366..44e31ae2e 100644 --- a/.github/workflows/ui-rke2-os-upgrade-rancher_latest.yaml +++ b/.github/workflows/ui-rke2-os-upgrade-rancher_latest.yaml @@ -37,8 +37,8 @@ jobs: destroy_runner: ${{ inputs.destroy_runner || true }} elemental_ui_version: dev iso_boot: true - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 rancher_version: ${{ inputs.rancher_version || 'latest/devel' }} test_type: ui upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal/5.4:latest - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/ui-rke2-os-upgrade-rancher_stable.yaml b/.github/workflows/ui-rke2-os-upgrade-rancher_stable.yaml index 2a7410c91..e9e9ac432 100644 --- a/.github/workflows/ui-rke2-os-upgrade-rancher_stable.yaml +++ b/.github/workflows/ui-rke2-os-upgrade-rancher_stable.yaml @@ -41,8 +41,8 @@ jobs: destroy_runner: ${{ inputs.destroy_runner || true }} elemental_ui_version: dev iso_boot: true - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 rancher_version: ${{ inputs.rancher_version || 'stable/latest' }} test_type: ui upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal/5.4:latest - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/ui-rke2-os-upgrade.yaml b/.github/workflows/ui-rke2-os-upgrade.yaml index 52f488def..14a132ccb 100644 --- a/.github/workflows/ui-rke2-os-upgrade.yaml +++ b/.github/workflows/ui-rke2-os-upgrade.yaml @@ -45,7 +45,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: dev iso_boot: true - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: ${{ inputs.operator_repo }} proxy: ${{ inputs.proxy }} rancher_version: ${{ inputs.rancher_version }} @@ -53,4 +53,4 @@ jobs: upgrade_channel_list: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal-dev-channel/5.4:latest upgrade_image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-teal/5.4:latest upgrade_os_channel: ${{ inputs.upgrade_os_channel }} - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/ui-rke2-rancher_latest.yaml b/.github/workflows/ui-rke2-rancher_latest.yaml index 2962d4314..72086c98e 100644 --- a/.github/workflows/ui-rke2-rancher_latest.yaml +++ b/.github/workflows/ui-rke2-rancher_latest.yaml @@ -31,7 +31,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner || true }} elemental_ui_version: dev iso_boot: true - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 rancher_version: ${{ inputs.rancher_version || 'latest/devel' }} test_type: ui - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 diff --git a/.github/workflows/ui-rke2-rancher_stable.yaml b/.github/workflows/ui-rke2-rancher_stable.yaml index dff7d500c..9598e4f86 100644 --- a/.github/workflows/ui-rke2-rancher_stable.yaml +++ b/.github/workflows/ui-rke2-rancher_stable.yaml @@ -34,7 +34,7 @@ jobs: destroy_runner: ${{ inputs.destroy_runner || true }} elemental_ui_version: dev iso_boot: true - k8s_version_to_provision: v1.25.7+rke2r1 + k8s_version_to_provision: v1.26.7+rke2r1 rancher_version: ${{ inputs.rancher_version || 'stable/latest' }} test_type: ui - upstream_cluster_version: v1.25.7+rke2r1 + upstream_cluster_version: v1.26.7+rke2r1 From 5e6eb2cfdbb81775a53ef35615e24d1739e8b49d Mon Sep 17 00:00:00 2001 From: Loic Devulder Date: Fri, 18 Aug 2023 16:54:05 +0200 Subject: [PATCH 2/5] ci: update ISO path to use for OBS tests Signed-off-by: Loic Devulder --- .github/workflows/cli-k3s-obs_dev.yaml | 2 +- .github/workflows/cli-k3s-obs_staging.yaml | 2 +- .github/workflows/cli-rke2-obs_dev.yaml | 2 +- .github/workflows/cli-rke2-obs_staging.yaml | 2 +- .github/workflows/ui-k3s-obs_dev.yaml | 2 +- .github/workflows/ui-k3s-obs_staging.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cli-k3s-obs_dev.yaml b/.github/workflows/cli-k3s-obs_dev.yaml index 1737ebdc5..407b15688 100644 --- a/.github/workflows/cli-k3s-obs_dev.yaml +++ b/.github/workflows/cli-k3s-obs_dev.yaml @@ -38,7 +38,7 @@ jobs: cluster_name: cluster-k3s cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} - iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev:/Teal53/media/iso/elemental-teal.x86_64.iso + iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev/containers/iso/elemental-teal.x86_64.iso k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/cli-k3s-obs_staging.yaml b/.github/workflows/cli-k3s-obs_staging.yaml index e7d95a4af..ebdddbb9e 100644 --- a/.github/workflows/cli-k3s-obs_staging.yaml +++ b/.github/workflows/cli-k3s-obs_staging.yaml @@ -38,7 +38,7 @@ jobs: cluster_name: cluster-k3s cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} - iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging:/Teal53/media/iso/elemental-teal.x86_64.iso + iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging/containers/iso/elemental-teal.x86_64.iso k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/cli-rke2-obs_dev.yaml b/.github/workflows/cli-rke2-obs_dev.yaml index 61b4e20d2..19f50a10f 100644 --- a/.github/workflows/cli-rke2-obs_dev.yaml +++ b/.github/workflows/cli-rke2-obs_dev.yaml @@ -39,7 +39,7 @@ jobs: cluster_name: cluster-rke2 cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} - iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev:/Teal53/media/iso/elemental-teal.x86_64.iso + iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev/containers/iso/elemental-teal.x86_64.iso k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/cli-rke2-obs_staging.yaml b/.github/workflows/cli-rke2-obs_staging.yaml index c7145c4b3..a25923807 100644 --- a/.github/workflows/cli-rke2-obs_staging.yaml +++ b/.github/workflows/cli-rke2-obs_staging.yaml @@ -39,7 +39,7 @@ jobs: cluster_name: cluster-rke2 cluster_type: ${{ inputs.cluster_type }} destroy_runner: ${{ inputs.destroy_runner }} - iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging:/Teal53/media/iso/elemental-teal.x86_64.iso + iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging/containers/iso/elemental-teal.x86_64.iso k8s_version_to_provision: v1.26.7+rke2r1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher rancher_version: ${{ inputs.rancher_version }} diff --git a/.github/workflows/ui-k3s-obs_dev.yaml b/.github/workflows/ui-k3s-obs_dev.yaml index 4f55c4495..b9fff4d1c 100644 --- a/.github/workflows/ui-k3s-obs_dev.yaml +++ b/.github/workflows/ui-k3s-obs_dev.yaml @@ -36,7 +36,7 @@ jobs: cypress_tags: main destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: dev - iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev:/Teal53/media/iso/elemental-teal.x86_64.iso + iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Dev/containers/iso/elemental-teal.x86_64.iso k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher proxy: ${{ inputs.proxy }} diff --git a/.github/workflows/ui-k3s-obs_staging.yaml b/.github/workflows/ui-k3s-obs_staging.yaml index 57f9f2381..700973a4c 100644 --- a/.github/workflows/ui-k3s-obs_staging.yaml +++ b/.github/workflows/ui-k3s-obs_staging.yaml @@ -36,7 +36,7 @@ jobs: cypress_tags: main destroy_runner: ${{ inputs.destroy_runner }} elemental_ui_version: dev - iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging:/Teal53/media/iso/elemental-teal.x86_64.iso + iso_to_test: https://download.opensuse.org/repositories/isv:/Rancher:/Elemental:/Staging/containers/iso/elemental-teal.x86_64.iso k8s_version_to_provision: v1.26.7+k3s1 operator_repo: oci://registry.opensuse.org/isv/rancher/elemental/staging/charts/rancher proxy: ${{ inputs.proxy }} From a727c62788c1a137ff259ef22562541c8cc76c9c Mon Sep 17 00:00:00 2001 From: Loic Devulder Date: Fri, 18 Aug 2023 17:46:06 +0200 Subject: [PATCH 3/5] ci: fix extraction of os-release file Signed-off-by: Loic Devulder --- .github/workflows/master-e2e.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master-e2e.yaml b/.github/workflows/master-e2e.yaml index d2ac98d9b..46fdfc635 100644 --- a/.github/workflows/master-e2e.yaml +++ b/.github/workflows/master-e2e.yaml @@ -319,8 +319,8 @@ jobs: -l app=rancher \ -o jsonpath={.items[*].status.containerStatuses[*].image} 2> /dev/null || true) # Extract OS version from ISO - isoinfo -i build/*.iso \ - -x /BOOT/INITRD.\;1 \ + INITRD_FILE=$(isoinfo -i build/*.iso -R -find -type f -name initrd -print 2>/dev/null) + isoinfo -i build/*.iso -R -x ${INITRD_FILE} 2>/dev/null \ | xz -dc \ | cpio -i --to-stdout usr/lib/initrd-release > os-release eval $(grep IMAGE_TAG os-release) From 757b5c801573add6bf19c9a4e0ecd9b24de05574 Mon Sep 17 00:00:00 2001 From: Loic Devulder Date: Mon, 21 Aug 2023 16:41:11 +0200 Subject: [PATCH 4/5] ci: fix extraction of ISO artifacts Signed-off-by: Loic Devulder --- Makefile | 60 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 1ea1ee921..b4322ceaa 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,8 @@ -GIT_COMMIT ?= $(shell git rev-parse HEAD) -GIT_COMMIT_SHORT ?= $(shell git rev-parse --short HEAD) -GIT_TAG ?= $(shell git describe --abbrev=0 --tags 2>/dev/null || echo "v0.0.0" ) -TAG ?= ${GIT_TAG}-${GIT_COMMIT_SHORT} +GIT_COMMIT?=$(shell git rev-parse HEAD) +GIT_COMMIT_SHORT?=$(shell git rev-parse --short HEAD) +GIT_TAG?=$(shell git describe --abbrev=0 --tags 2>/dev/null || echo "v0.0.0" ) +TAG?=${GIT_TAG}-${GIT_COMMIT_SHORT} REPO?=ttl.sh/elemental-ci -IMAGE=${REPO}:${GIT_TAG} -ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -SUDO?=sudo -FRAMEWORK_PACKAGES?=meta/cos-light CLOUD_CONFIG_FILE?="iso/config" MANIFEST_FILE?="iso/manifest.yaml" # This are the default images already in the dockerfile but we want to be able to override them @@ -19,11 +15,14 @@ RELEASE_TAG?=false # Set tag based on release status for ease of use ifeq ($(RELEASE_TAG), "true") -FINAL_TAG=$(GIT_TAG) +FINAL_TAG:=$(GIT_TAG) else -FINAL_TAG=$(TAG) +FINAL_TAG:=$(TAG) endif +# Set ISO variable +ISO?=build/elemental-${FINAL_TAG}.iso + .PHONY: clean clean: rm -rf build @@ -78,7 +77,7 @@ endif -o /mnt \ -n elemental-${FINAL_TAG} \ --overlay-iso overlay dir:rootfs - @echo "INFO: ISO available at build/elemental-${FINAL_TAG}.iso" + @echo "INFO: ISO available at ${ISO}" # Build an iso with the OBS base containers .PHONY: remote_iso @@ -104,37 +103,40 @@ endif -o /mnt \ -n elemental-${FINAL_TAG} \ --overlay-iso overlay dir:rootfs - @echo "INFO: ISO available at build/elemental-${FINAL_TAG}.iso" + @echo "INFO: ISO available at ${ISO}" .PHONY: extract_kernel_init_squash extract_kernel_init_squash: - isoinfo -x /rootfs.squashfs -R -i build/elemental-${FINAL_TAG}.iso > build/elemental-${FINAL_TAG}.squashfs - isoinfo -x /boot/kernel -R -i build/elemental-${FINAL_TAG}.iso > build/elemental-${FINAL_TAG}-kernel - isoinfo -x /boot/initrd -R -i build/elemental-${FINAL_TAG}.iso > build/elemental-${FINAL_TAG}-initrd + @VAR='$(ISO)'; \ + INITRD_FILE=$$(isoinfo -R -i ${ISO} -find -type f -name initrd -print 2>/dev/null); \ + KERNEL_FILE=$$(isoinfo -R -i ${ISO} -find -type f -name kernel -print 2>/dev/null); \ + [[ -z "$${KERNEL_FILE}" ]] && KERNEL_FILE=$$(isoinfo -R -i ${ISO} -find -type f -name linux -print 2>/dev/null); \ + isoinfo -x /rootfs.squashfs -R -i ${ISO} > $${VAR/\.iso/.squashfs} 2>/dev/null; \ + isoinfo -x $${INITRD_FILE} -R -i ${ISO} > $${VAR/\.iso/-initrd} 2>/dev/null; \ + isoinfo -x $${KERNEL_FILE} -R -i ${ISO} > $${VAR/\.iso/-kernel} 2>/dev/null .PHONY: ipxe ipxe: @mkdir -p build - echo "#!ipxe" > build/elemental-${FINAL_TAG}.ipxe - echo "set arch amd64" >> build/elemental-${FINAL_TAG}.ipxe + @echo "#!ipxe" > build/elemental-${FINAL_TAG}.ipxe + @echo "set arch amd64" >> build/elemental-${FINAL_TAG}.ipxe ifeq ($(RELEASE_TAG), "true") - echo "set url https://github.com/rancher/elemental/releases/download/${FINAL_TAG}" >> build/elemental-${FINAL_TAG}.ipxe + @echo "set url https://github.com/rancher/elemental/releases/download/${FINAL_TAG}" >> build/elemental-${FINAL_TAG}.ipxe else - echo "set url tftp://10.0.2.2/${TAG}" >> build/elemental-${FINAL_TAG}.ipxe + @echo "set url tftp://10.0.2.2/${TAG}" >> build/elemental-${FINAL_TAG}.ipxe endif - echo "set kernel elemental-${FINAL_TAG}-kernel" >> build/elemental-${FINAL_TAG}.ipxe - echo "set initrd elemental-${FINAL_TAG}-initrd" >> build/elemental-${FINAL_TAG}.ipxe - echo "set rootfs elemental-${FINAL_TAG}.squashfs" >> build/elemental-${FINAL_TAG}.ipxe - echo "set iso elemental-${FINAL_TAG}.iso" >> build/elemental-${FINAL_TAG}.ipxe #not used anymore, check if we can boot from iso directly with sanboot? - echo "# set config http://example.com/machine-config" >> build/elemental-${FINAL_TAG}.ipxe - echo "# set cmdline extra.values=1" >> build/elemental-${FINAL_TAG}.ipxe - echo "initrd \$${url}/\$${initrd}" >> build/elemental-${FINAL_TAG}.ipxe - echo "chain --autofree --replace \$${url}/\$${kernel} initrd=\$${initrd} ip=dhcp rd.cos.disable root=live:\$${url}/\$${rootfs} stages.initramfs[0].commands[0]=\"curl -k \$${config} > /run/initramfs/live/livecd-cloud-config.yaml\" console=tty1 console=ttyS0 \$${cmdline}" >> build/elemental-${FINAL_TAG}.ipxe + @echo "set kernel elemental-${FINAL_TAG}-kernel" >> build/elemental-${FINAL_TAG}.ipxe + @echo "set initrd elemental-${FINAL_TAG}-initrd" >> build/elemental-${FINAL_TAG}.ipxe + @echo "set rootfs elemental-${FINAL_TAG}.squashfs" >> build/elemental-${FINAL_TAG}.ipxe + @echo "# set config http://example.com/machine-config" >> build/elemental-${FINAL_TAG}.ipxe + @echo "# set cmdline extra.values=1" >> build/elemental-${FINAL_TAG}.ipxe + @echo "initrd \$${url}/\$${initrd}" >> build/elemental-${FINAL_TAG}.ipxe + @echo "chain --autofree --replace \$${url}/\$${kernel} initrd=\$${initrd} ip=dhcp rd.cos.disable root=live:\$${url}/\$${rootfs} stages.initramfs[0].commands[0]=\"curl -k \$${config} > /run/initramfs/live/livecd-cloud-config.yaml\" console=tty1 console=ttyS0 \$${cmdline}" >> build/elemental-${FINAL_TAG}.ipxe .PHONY: build_all build_all: build iso extract_kernel_init_squash ipxe .PHONY: docs docs: - yarn install --frozen-lockfile - yarn build + @yarn install --frozen-lockfile + @yarn build From 01346cc22529820ba0b960887b835a068752e00f Mon Sep 17 00:00:00 2001 From: Loic Devulder Date: Tue, 22 Aug 2023 12:16:49 +0200 Subject: [PATCH 5/5] ci: keep compatibility with older Stable versions Test of Elemental installation using Seed image has a different behaviour in Dev and Stable. Signed-off-by: Loic Devulder --- tests/e2e/bootstrap_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/e2e/bootstrap_test.go b/tests/e2e/bootstrap_test.go index 0f00ff103..4972088e7 100644 --- a/tests/e2e/bootstrap_test.go +++ b/tests/e2e/bootstrap_test.go @@ -268,7 +268,8 @@ var _ = Describe("E2E - Bootstrapping node", Label("bootstrap"), func() { // Check that the installation is completed before halting the VM Eventually(func() error { - _, err := cl.RunSSH("journalctl -u elemental-register-install.service --no-pager | grep -iq 'elemental install completed'") + // A little bit dirty but this is temporary to keep compatibility with older Stable versions + _, err := cl.RunSSH("(journalctl --no-pager -u elemental-register.service ; journalctl --no-pager -u elemental-register-install.service) | grep -Eiq 'elemental install.* completed'") return err }, tools.SetTimeout(8*time.Minute), 10*time.Second).Should(Not(HaveOccurred()))