Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI issues #1043

Merged
merged 3 commits into from
Oct 13, 2023
Merged

Fix CI issues #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a561390
ci: add 'destroy_runner' option in all CLI tests
ldevulder Oct 13, 2023
18965fb
ci: wait a bit after Rancher Manager deployment/upgrade
ldevulder Oct 13, 2023
03d2324
ci: don't delete ISO file after node installation
ldevulder Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/cli-k3s-hardened-rancher_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-K3s-Hardened-Rancher_Latest

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -18,6 +23,7 @@ jobs:
cert-manager_version: v1.11.1
cluster_name: cluster-k3s
cluster_type: hardened
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+k3s1
node_number: 3
rancher_version: latest/devel
6 changes: 6 additions & 0 deletions .github/workflows/cli-k3s-hardened-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-K3s-Hardened-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -18,5 +23,6 @@ jobs:
cert-manager_version: v1.11.1
cluster_name: cluster-k3s
cluster_type: hardened
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+k3s1
node_number: 3
6 changes: 6 additions & 0 deletions .github/workflows/cli-k3s-os-upgrade-rancher_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-K3s-OS-Upgrade-Rancher_Latest

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 2 * * *'

Expand All @@ -16,6 +21,7 @@ jobs:
with:
test_description: "CI - CLI - Parallel - OS Upgrade test with Standard K3s"
cluster_name: cluster-k3s
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+k3s1
node_number: 5
operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cli-k3s-os-upgrade-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-K3s-OS-Upgrade-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 2 * * *'

Expand All @@ -16,6 +21,7 @@ jobs:
with:
test_description: "CI - CLI - Parallel - OS Upgrade test with Standard K3s"
cluster_name: cluster-k3s
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+k3s1
node_number: 5
operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cli-k3s-rancher_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-K3s-Rancher_Latest

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -16,5 +21,6 @@ jobs:
with:
test_description: "CI - CLI - Parallel - Deployment test with Standard K3s"
cluster_name: cluster-k3s
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+k3s1
rancher_version: latest/devel
6 changes: 6 additions & 0 deletions .github/workflows/cli-k3s-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-K3s-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -16,4 +21,5 @@ jobs:
with:
test_description: "CI - CLI - Parallel - Deployment test with Standard K3s"
cluster_name: cluster-k3s
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+k3s1
6 changes: 6 additions & 0 deletions .github/workflows/cli-k3s-sequential-rancher_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-K3s-Sequential-Rancher_Latest

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -16,6 +21,7 @@ jobs:
with:
test_description: "CI/Manual - CLI - Sequential - Deployment test with Standard K3s"
cluster_name: cluster-k3s
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+k3s1
rancher_version: latest/devel
sequential: true
6 changes: 6 additions & 0 deletions .github/workflows/cli-k3s-sequential-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-K3s-Sequential-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -16,6 +21,7 @@ jobs:
with:
test_description: "CI/Manual - CLI - Sequential - Deployment test with Standard K3s"
cluster_name: cluster-k3s
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+k3s1
rancher_version: stable/latest
sequential: true
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-hardened-rancher_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-Hardened-Rancher_Latest

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -18,6 +23,7 @@ jobs:
ca_type: private
cluster_name: cluster-rke2
cluster_type: hardened
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
node_number: 3
rancher_version: latest/devel
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-hardened-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-Hardened-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -18,6 +23,7 @@ jobs:
ca_type: private
cluster_name: cluster-rke2
cluster_type: hardened
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
node_number: 3
upstream_cluster_version: v1.26.8+rke2r1
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-os-upgrade-rancher_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-OS-Upgrade-Rancher_Latest

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 2 * * *'

Expand All @@ -17,6 +22,7 @@ jobs:
test_description: "CI - CLI - Parallel - OS Upgrade test with Standard RKE2"
ca_type: private
cluster_name: cluster-rke2
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
node_number: 5
operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-os-upgrade-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-OS-Upgrade-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 2 * * *'

Expand All @@ -17,6 +22,7 @@ jobs:
test_description: "CI - CLI - Parallel - OS Upgrade test with Standard RKE2"
ca_type: private
cluster_name: cluster-rke2
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
node_number: 5
operator_upgrade: oci://registry.opensuse.org/isv/rancher/elemental/dev/charts/rancher
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-rancher_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-Rancher_Latest

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -17,6 +22,7 @@ jobs:
test_description: "CI - CLI - Parallel - Deployment test with Standard RKE2"
ca_type: private
cluster_name: cluster-rke2
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
rancher_version: latest/devel
upstream_cluster_version: v1.26.8+rke2r1
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -17,5 +22,6 @@ jobs:
test_description: "CI - CLI - Parallel - Deployment test with Standard RKE2"
ca_type: private
cluster_name: cluster-rke2
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
upstream_cluster_version: v1.26.8+rke2r1
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-scalability-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-Scalability-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
# Every Sunday at 3am
- cron: '0 3 * * 0'
Expand All @@ -18,6 +23,7 @@ jobs:
test_description: "CI/Manual - CLI - Scalability - Deployment test with Standard RKE2"
ca_type: private
cluster_name: cluster-rke2
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
node_number: 60
rancher_version: stable/latest
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-sequential-rancher_latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-Sequential-Rancher_Latest

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -17,6 +22,7 @@ jobs:
test_description: "CI/Manual - CLI - Sequential - Deployment test with Standard RKE2"
ca_type: private
cluster_name: cluster-rke2
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
rancher_version: latest/devel
sequential: true
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cli-rke2-sequential-rancher_stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CLI-RKE2-Sequential-Rancher_Stable

on:
workflow_dispatch:
inputs:
destroy_runner:
description: Destroy the auto-generated self-hosted runner
default: true
type: boolean
schedule:
- cron: '0 1 * * *'

Expand All @@ -17,6 +22,7 @@ jobs:
test_description: "CI/Manual - CLI - Sequential - Deployment test with Standard RKE2"
ca_type: private
cluster_name: cluster-rke2
destroy_runner: ${{ inputs.destroy_runner }}
k8s_version_to_provision: v1.26.8+rke2r1
rancher_version: stable/latest
sequential: true
Expand Down
7 changes: 0 additions & 7 deletions tests/e2e/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,12 +437,5 @@ var _ = Describe("E2E - Bootstrapping node", Label("bootstrap"), func() {
By("Checking cluster state after reboot", func() {
CheckClusterState(clusterNS, clusterName)
})

if isoBoot == "true" {
By("Removing the ISO", func() {
err := exec.Command("bash", "-c", "rm -f ../../elemental-*.iso").Run()
Expect(err).To(Not(HaveOccurred()))
})
}
})
})
3 changes: 3 additions & 0 deletions tests/e2e/install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@ var _ = Describe("E2E - Install Rancher Manager", Label("install"), func() {
rolloutDeployment("cattle-system", "rancher")
}

// A bit dirty be better to wait a little here for all to be correctly started
time.Sleep(2 * time.Minute)

// Check issuer for Private CA
if caType == "private" {
Eventually(func() error {
Expand Down
3 changes: 3 additions & 0 deletions tests/e2e/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ var _ = Describe("E2E - Upgrading Rancher Manager", Label("upgrade-rancher-manag
return rancher.CheckPod(k, checkList)
}, tools.SetTimeout(3*time.Minute), 10*time.Second).Should(Not(HaveOccurred()))

// A bit dirty be better to wait a little here for all to be correctly started
time.Sleep(2 * time.Minute)

// Check that all pods are using the same version
Eventually(func() int {
out, _ := kubectl.Run(getImageVersion...)
Expand Down