From ff708730686238cf8b3bd3c05deaf4dfd6685d17 Mon Sep 17 00:00:00 2001 From: Gerrit Date: Thu, 18 Apr 2024 09:49:30 +0200 Subject: [PATCH 01/15] Bump extension-provider-gcp to v0.33.1. --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index b2a084c3..b57dfd2c 100644 --- a/release.yaml +++ b/release.yaml @@ -195,7 +195,7 @@ docker-images: tag: v0.15.9 extension-provider-gcp: name: eu.gcr.io/gardener-project/gardener/extensions/provider-gcp - tag: v1.32.1 + tag: v1.33.1 external-dns: name: europe-docker.pkg.dev/gardener-project/releases/dns-controller-manager tag: v0.18.2 From 1afb0b7750253f7384d3f1934fd0ed5f3de80dc8 Mon Sep 17 00:00:00 2001 From: Gerrit Date: Thu, 18 Apr 2024 10:19:56 +0200 Subject: [PATCH 02/15] Bump to g/g 1.81.7. --- release.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/release.yaml b/release.yaml index b57dfd2c..11f694fa 100644 --- a/release.yaml +++ b/release.yaml @@ -183,13 +183,13 @@ docker-images: tag: v1.0.1 admission-controller: name: eu.gcr.io/gardener-project/gardener/admission-controller - tag: v1.80.7 + tag: v1.81.7 api-server: name: eu.gcr.io/gardener-project/gardener/apiserver - tag: v1.80.7 + tag: v1.81.7 controller-manager: name: eu.gcr.io/gardener-project/gardener/controller-manager - tag: v1.80.7 + tag: v1.81.7 dns-controller-manager: name: eu.gcr.io/gardener-project/dns-controller-manager tag: v0.15.9 @@ -201,7 +201,7 @@ docker-images: tag: v0.18.2 gardenlet: name: eu.gcr.io/gardener-project/gardener/gardenlet - tag: v1.80.7 + tag: v1.81.7 metrics-exporter: name: europe-docker.pkg.dev/gardener-project/releases/gardener/metrics-exporter tag: 0.29.0 @@ -213,10 +213,10 @@ docker-images: tag: v1.26.0 operator: name: eu.gcr.io/gardener-project/gardener/operator - tag: v1.80.7 + tag: v1.81.7 scheduler: name: eu.gcr.io/gardener-project/gardener/scheduler - tag: v1.80.7 + tag: v1.81.7 shoot-cert-service: name: eu.gcr.io/gardener-project/gardener/extensions/shoot-cert-service tag: v1.38.0 @@ -279,5 +279,5 @@ repositories: ref: v0.15.4 url: https://github.com/gardener/etcd-backup-restore.git gardener: - ref: v1.80.7 + ref: v1.81.7 url: https://github.com/gardener/gardener.git From f9c04785b2b69a422f5e1684903c36e2a15eabac Mon Sep 17 00:00:00 2001 From: metal-stack Date: Thu, 18 Apr 2024 11:58:39 +0000 Subject: [PATCH 03/15] Bump metal-roles to version v0.11.13 --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index 11f694fa..8771bd10 100644 --- a/release.yaml +++ b/release.yaml @@ -7,7 +7,7 @@ ansible-roles: version: v0.2.9 metal-roles: repository: https://github.com/metal-stack/metal-roles - version: v0.11.12 + version: v0.11.13 binaries: metal-stack: kernel: From 61de28aca602654050588e3b9d9aa47caff774aa Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Fri, 19 Apr 2024 09:14:50 +0200 Subject: [PATCH 04/15] Rollback g/g again to v1.80. --- release.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/release.yaml b/release.yaml index 8771bd10..18dd9d9c 100644 --- a/release.yaml +++ b/release.yaml @@ -183,13 +183,13 @@ docker-images: tag: v1.0.1 admission-controller: name: eu.gcr.io/gardener-project/gardener/admission-controller - tag: v1.81.7 + tag: v1.80.7 api-server: name: eu.gcr.io/gardener-project/gardener/apiserver - tag: v1.81.7 + tag: v1.80.7 controller-manager: name: eu.gcr.io/gardener-project/gardener/controller-manager - tag: v1.81.7 + tag: v1.80.7 dns-controller-manager: name: eu.gcr.io/gardener-project/dns-controller-manager tag: v0.15.9 @@ -201,7 +201,7 @@ docker-images: tag: v0.18.2 gardenlet: name: eu.gcr.io/gardener-project/gardener/gardenlet - tag: v1.81.7 + tag: v1.80.7 metrics-exporter: name: europe-docker.pkg.dev/gardener-project/releases/gardener/metrics-exporter tag: 0.29.0 @@ -213,10 +213,10 @@ docker-images: tag: v1.26.0 operator: name: eu.gcr.io/gardener-project/gardener/operator - tag: v1.81.7 + tag: v1.80.7 scheduler: name: eu.gcr.io/gardener-project/gardener/scheduler - tag: v1.81.7 + tag: v1.80.7 shoot-cert-service: name: eu.gcr.io/gardener-project/gardener/extensions/shoot-cert-service tag: v1.38.0 @@ -279,5 +279,5 @@ repositories: ref: v0.15.4 url: https://github.com/gardener/etcd-backup-restore.git gardener: - ref: v1.81.7 + ref: v1.80.7 url: https://github.com/gardener/gardener.git From c1de917d40f814db4275033ee7cf0a7da0951aa6 Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Fri, 19 Apr 2024 11:24:42 +0200 Subject: [PATCH 05/15] Rollback extension-provider-gcp --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index 18dd9d9c..c02da156 100644 --- a/release.yaml +++ b/release.yaml @@ -195,7 +195,7 @@ docker-images: tag: v0.15.9 extension-provider-gcp: name: eu.gcr.io/gardener-project/gardener/extensions/provider-gcp - tag: v1.33.1 + tag: v1.32.1 external-dns: name: europe-docker.pkg.dev/gardener-project/releases/dns-controller-manager tag: v0.18.2 From f8de9aca353f51044c9b3f116b5dd639fc5ace91 Mon Sep 17 00:00:00 2001 From: metal-stack Date: Mon, 22 Apr 2024 06:47:58 +0000 Subject: [PATCH 06/15] Bump kernel to version 6.6.28-141 --- release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.yaml b/release.yaml index c02da156..dafd9713 100644 --- a/release.yaml +++ b/release.yaml @@ -12,8 +12,8 @@ binaries: metal-stack: kernel: repository: https://github.com/metal-stack/kernel - url: https://github.com/metal-stack/kernel/releases/download/6.6.26-140/metal-kernel - version: 6.6.26-140 + url: https://github.com/metal-stack/kernel/releases/download/6.6.28-141/metal-kernel + version: 6.6.28-141 metal-hammer: repository: https://github.com/metal-stack/metal-hammer url: https://github.com/metal-stack/metal-hammer/releases/download/v0.12.3/metal-hammer-initrd.img.lz4 From 2110200ef0cad4402d4f921aec1de594f5c31f81 Mon Sep 17 00:00:00 2001 From: metal-stack Date: Tue, 23 Apr 2024 08:13:52 +0000 Subject: [PATCH 07/15] Bump gardener-extension-provider-metal to version v0.22.10 --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index dafd9713..abb2c7bf 100644 --- a/release.yaml +++ b/release.yaml @@ -66,7 +66,7 @@ docker-images: gardener-extension-provider-metal: name: ghcr.io/metal-stack/gardener-extension-provider-metal repository: https://github.com/metal-stack/gardener-extension-provider-metal - tag: v0.22.9 + tag: v0.22.10 machine-controller-manager: name: eu.gcr.io/gardener-project/gardener/machine-controller-manager repository: https://github.com/gardener/machine-controller-manager From fd2c56859b130180864d9969dc9ea80aaec26ca0 Mon Sep 17 00:00:00 2001 From: metal-stack Date: Tue, 23 Apr 2024 14:30:10 +0000 Subject: [PATCH 08/15] Bump firewall-controller-manager to version v0.3.5 --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index abb2c7bf..d14a4bf8 100644 --- a/release.yaml +++ b/release.yaml @@ -58,7 +58,7 @@ docker-images: firewall-controller-manager: name: ghcr.io/metal-stack/firewall-controller-manager repository: https://github.com/metal-stack/firewall-controller-manager - tag: v0.3.4 + tag: v0.3.5 gardener-extension-audit: name: ghcr.io/metal-stack/gardener-extension-audit repository: https://github.com/metal-stack/gardener-extension-audit From f77369595cb2fc3ccd4cbd6629a6374e2e4f2854 Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Mon, 29 Apr 2024 10:54:41 +0200 Subject: [PATCH 09/15] Try running both mini-lab flavors. --- .github/workflows/integration.yaml | 14 ++++++++++++-- test/integration/ci-prep.sh | 1 - 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 33c89c84..b86308cc 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -16,6 +16,15 @@ jobs: test: name: Integration tests runs-on: self-hosted + + strategy: + matrix: + flavors: + - name: sonic + env: MINI_LAB_FLAVOR=sonic + - name: cumulus + env: MINI_LAB_FLAVOR=cumulus + steps: - name: Gain back workspace permissions # https://github.com/actions/checkout/issues/211 run: | @@ -40,6 +49,7 @@ jobs: uses: EnricoMi/publish-unit-test-result-action@v2 with: files: test/integration/**/output/*.xml + if: ${{ matrix.flavors.name == 'sonic' }} - name: Slack Notification on Success uses: rtCamp/action-slack-notify@v2 @@ -48,11 +58,11 @@ jobs: env: SLACK_COLOR: good SLACK_TITLE: 'Integration Tests succeeded' - if: ${{ success() }} + if: ${{ matrix.flavors.name == 'sonic' && success() }} - name: Slack Notification on Failure uses: rtCamp/action-slack-notify@v2 env: SLACK_COLOR: red SLACK_TITLE: 'Integration Tests failed' - if: ${{ failure() }} + if: ${{ matrix.flavors.name == 'sonic' && failure() }} diff --git a/test/integration/ci-prep.sh b/test/integration/ci-prep.sh index e119166e..b9e338bf 100755 --- a/test/integration/ci-prep.sh +++ b/test/integration/ci-prep.sh @@ -27,7 +27,6 @@ cd "${MINI_LAB_PATH}" git checkout "${MINI_LAB_VERSION}" # self hosted runners get dirty, we need to clean up first -make cleanup ./test/ci-cleanup.sh cd - From afd76879d94f7a8163945affbaf4a3ced4ccebf1 Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Mon, 29 Apr 2024 11:08:45 +0200 Subject: [PATCH 10/15] Set as env var. --- .github/workflows/integration.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index b86308cc..5cab4438 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -21,9 +21,7 @@ jobs: matrix: flavors: - name: sonic - env: MINI_LAB_FLAVOR=sonic - name: cumulus - env: MINI_LAB_FLAVOR=cumulus steps: - name: Gain back workspace permissions # https://github.com/actions/checkout/issues/211 @@ -42,6 +40,7 @@ jobs: make integration-deployment make integration-ansible-modules env: + MINI_LAB_FLAVOR: ${{ matrix.flavors.name }} DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }} DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }} From 3ffafd524ecb6c3b9321c72bfd1eea6185a1198f Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Mon, 29 Apr 2024 11:56:12 +0200 Subject: [PATCH 11/15] Fix tests for sonic. --- test/integration/deployment/test/common.py | 1 - .../integration/deployment/test/deployment_test.py | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/test/integration/deployment/test/common.py b/test/integration/deployment/test/common.py index ed1a2d2a..e0e0258e 100644 --- a/test/integration/deployment/test/common.py +++ b/test/integration/deployment/test/common.py @@ -1,4 +1,3 @@ -import time import unittest diff --git a/test/integration/deployment/test/deployment_test.py b/test/integration/deployment/test/deployment_test.py index 5b91c46b..e042f4f7 100644 --- a/test/integration/deployment/test/deployment_test.py +++ b/test/integration/deployment/test/deployment_test.py @@ -76,18 +76,24 @@ class MetalSwitchPlaneDeployment(common.TestinfraCommon): def __init__(self, *args, **kwargs): super(MetalSwitchPlaneDeployment, self).__init__(*args, **kwargs) self.hosts = testinfra.get_hosts(["ssh://leaf01", "ssh://leaf02"]) + self.is_sonic = self.hosts[0].file("/etc/sonic/sonic_version.yml").exists def test_metal_core_service(self): for host in self.hosts: self.service_enabled_and_running(host, "metal-core") def test_pixiecore_service(self): - for host in self.hosts: - self.service_enabled_and_running(self.hosts[0], "pixiecore") + self.service_enabled_and_running(self.hosts[0], "pixiecore") def test_frr_service(self): for host in self.hosts: - self.service_enabled_and_running(host, "frr") + if self.is_sonic: + self.service_enabled_and_running(host, "bgp") + else: + self.service_enabled_and_running(host, "frr") def test_dhcpd_service(self): - self.service_enabled_and_running(self.hosts[0], "dhcpd") + if self.is_sonic: + self.service_enabled_and_running(self.hosts[0], "isc-dhcp-server") + else: + self.service_enabled_and_running(self.hosts[0], "dhcpd") From 46ddad8418aaa72b732c067c1cfcda554a932ec9 Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Mon, 29 Apr 2024 13:28:12 +0200 Subject: [PATCH 12/15] Setup containerlab in workflow. --- .github/workflows/integration.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 5cab4438..1b23f7d0 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -28,6 +28,14 @@ jobs: run: | [ -d "${GITHUB_WORKSPACE}" ] && sudo chown -R $USER:$USER ${GITHUB_WORKSPACE} + - name: Setup Containerlab + run: | + bash -c "$(curl -sL https://get.containerlab.dev)" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # we can remove desired version again after this fix was released: https://github.com/srl-labs/containerlab/pull/2000 + DESIRED_VERSION: v0.52.0 + - name: Checkout uses: actions/checkout@v4 From 2edb81c420bb819d0b44b17ad58084a227a21f9e Mon Sep 17 00:00:00 2001 From: metal-stack Date: Mon, 29 Apr 2024 12:06:43 +0000 Subject: [PATCH 13/15] Bump metal-roles to version v0.11.14 --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index d14a4bf8..4109015a 100644 --- a/release.yaml +++ b/release.yaml @@ -7,7 +7,7 @@ ansible-roles: version: v0.2.9 metal-roles: repository: https://github.com/metal-stack/metal-roles - version: v0.11.13 + version: v0.11.14 binaries: metal-stack: kernel: From d84222640f6104664e49717e376172fa29e70afa Mon Sep 17 00:00:00 2001 From: metal-stack Date: Mon, 29 Apr 2024 12:07:34 +0000 Subject: [PATCH 14/15] Bump mini-lab to version v0.4.0 --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index 4109015a..4ce46cb8 100644 --- a/release.yaml +++ b/release.yaml @@ -271,7 +271,7 @@ projects: metal-stack: mini-lab: repository: https://github.com/metal-stack/mini-lab - version: v0.3.6 + version: v0.4.0 repositories: third-party: gardener: From fe5693cd71822a42d143a3d7d17ed2d665a84b30 Mon Sep 17 00:00:00 2001 From: metal-stack Date: Thu, 2 May 2024 06:22:02 +0000 Subject: [PATCH 15/15] Bump metal-roles to version v0.11.15 --- release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.yaml b/release.yaml index 4ce46cb8..2d6628ea 100644 --- a/release.yaml +++ b/release.yaml @@ -7,7 +7,7 @@ ansible-roles: version: v0.2.9 metal-roles: repository: https://github.com/metal-stack/metal-roles - version: v0.11.14 + version: v0.11.15 binaries: metal-stack: kernel: