From 939ab0bb6a77db9690f05b9a8a880394a79933f9 Mon Sep 17 00:00:00 2001 From: Loic Devulder Date: Fri, 1 Mar 2024 11:32:48 +0100 Subject: [PATCH] ci: fix airgap scheduled tests The scheduled tests cannot be defined with inputs left empty. Signed-off-by: Loic Devulder --- .github/workflows/cli-k3s-airgap_rm_latest_dev.yaml | 2 -- .github/workflows/cli-k3s-airgap_rm_stable.yaml | 8 -------- .github/workflows/master_e2e.yaml | 3 +-- .github/workflows/sub_airgap.yaml | 5 ----- .github/workflows/sub_test_choice.yaml | 1 - tests/e2e/suite_test.go | 2 +- 6 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/cli-k3s-airgap_rm_latest_dev.yaml b/.github/workflows/cli-k3s-airgap_rm_latest_dev.yaml index 0e310e816..1c8a5ddc6 100644 --- a/.github/workflows/cli-k3s-airgap_rm_latest_dev.yaml +++ b/.github/workflows/cli-k3s-airgap_rm_latest_dev.yaml @@ -23,7 +23,5 @@ jobs: cluster_name: airgap-cluster destroy_runner: ${{ github.event_name == 'schedule' && true || inputs.destroy_runner }} k8s_version_to_provision: v1.27.10+k3s2 - os_to_test: dev rancher_version: latest/devel test_type: airgap - upstream_cluster_version: v1.26.10+k3s2 diff --git a/.github/workflows/cli-k3s-airgap_rm_stable.yaml b/.github/workflows/cli-k3s-airgap_rm_stable.yaml index 2ca15ecfd..e096b9933 100644 --- a/.github/workflows/cli-k3s-airgap_rm_stable.yaml +++ b/.github/workflows/cli-k3s-airgap_rm_stable.yaml @@ -8,10 +8,6 @@ on: description: Destroy the auto-generated self-hosted runner default: true type: boolean - operator_repo: - description: Operator version to use for initial deployment - default: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher - type: string schedule: - cron: '0 8 * * *' @@ -27,8 +23,4 @@ jobs: cluster_name: airgap-cluster destroy_runner: ${{ github.event_name == 'schedule' && true || inputs.destroy_runner }} k8s_version_to_provision: v1.27.10+k3s2 - operator_repo: ${{ inputs.operator_repo }} - os_to_test: dev - rancher_version: stable/latest test_type: airgap - upstream_cluster_version: v1.26.10+k3s2 diff --git a/.github/workflows/master_e2e.yaml b/.github/workflows/master_e2e.yaml index a99a78d8f..d2b2fe438 100644 --- a/.github/workflows/master_e2e.yaml +++ b/.github/workflows/master_e2e.yaml @@ -71,7 +71,7 @@ on: type: string rancher_version: description: Rancher Manager channel/version/head_version to use for installation - default: stable/latest/none + default: stable/latest type: string reset: description: Allow reset test (mainly used on CLI tests) @@ -107,7 +107,6 @@ on: type: string upstream_cluster_version: description: Cluster upstream version where to install Rancher (K3s or RKE2) - #default: v1.27.10+k3s2 default: v1.26.10+k3s2 type: string zone: diff --git a/.github/workflows/sub_airgap.yaml b/.github/workflows/sub_airgap.yaml index 3736eb5d1..1c8dd2cfc 100644 --- a/.github/workflows/sub_airgap.yaml +++ b/.github/workflows/sub_airgap.yaml @@ -14,9 +14,6 @@ on: cluster_namespace: required: true type: string - cluster_type: - required: true - type: string k8s_version_to_provision: required: true type: string @@ -62,7 +59,6 @@ jobs: CERT_MANAGER_VERSION: ${{ inputs.cert-manager_version }} CLUSTER_NAME: ${{ inputs.cluster_name }} CLUSTER_NS: ${{ inputs.cluster_namespace }} - CLUSTER_TYPE: ${{ inputs.cluster_type }} # Distribution to use to host Rancher Manager (K3s) K8S_UPSTREAM_VERSION: ${{ inputs.upstream_cluster_version }} # For K8s cluster to provision with Rancher Manager @@ -158,7 +154,6 @@ jobs: with: ca_type: ${{ inputs.ca_type }} cert_manager_version: ${{ steps.component.outputs.cert_manager_version }} - cluster_type: ${{ inputs.cluster_type }} k8s_version_to_provision: ${{ inputs.k8s_version_to_provision }} operator_version: ${{ steps.component.outputs.operator_version }} os_to_test: ${{ inputs.os_to_test }} diff --git a/.github/workflows/sub_test_choice.yaml b/.github/workflows/sub_test_choice.yaml index c9ee44dc0..cbaf90476 100644 --- a/.github/workflows/sub_test_choice.yaml +++ b/.github/workflows/sub_test_choice.yaml @@ -119,7 +119,6 @@ jobs: cert-manager_version: ${{ inputs.cert-manager_version }} cluster_name: ${{ inputs.cluster_name }} cluster_namespace: ${{ inputs.cluster_namespace }} - cluster_type: ${{ inputs.cluster_type }} k8s_version_to_provision: ${{ inputs.k8s_version_to_provision }} operator_repo: ${{ inputs.operator_repo }} os_to_test: ${{ inputs.os_to_test }} diff --git a/tests/e2e/suite_test.go b/tests/e2e/suite_test.go index 6e9fb7e21..21c040bd4 100644 --- a/tests/e2e/suite_test.go +++ b/tests/e2e/suite_test.go @@ -307,7 +307,7 @@ func DownloadBuiltISO(ns, seedName, filename string) { seedName, "-o", "jsonpath={.status}") return out - }, tools.SetTimeout(3*time.Minute), 5*time.Second).Should(ContainSubstring("downloadURL")) + }, tools.SetTimeout(5*time.Minute), 5*time.Second).Should(ContainSubstring("downloadURL")) // Get URL seedImageURL, err := kubectl.RunWithoutErr("get", "SeedImage",