From 7b37e5b63d54c2d197336e4fbee941fa5f2423c0 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Mon, 27 May 2024 14:52:08 +0530 Subject: [PATCH] chore(ci): fix integration extensions Now that extensions run the `extensions-validator` we need to fetch proper tags. Signed-off-by: Noel Georgi --- .github/workflows/ci.yaml | 5 ++++- .github/workflows/integration-extensions-cron.yaml | 5 ++++- .kres.yaml | 3 +++ Makefile | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2367bdba00..e2d933f5f2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-05-25T14:28:32Z by kres b5844f8. +# Generated on 2024-05-27T09:21:08Z by kres b5844f8. name: default concurrency: @@ -1265,6 +1265,9 @@ jobs: path: _out/extensions ref: main repository: siderolabs/extensions + - name: unshallow-extensions + run: | + git -C _out/extensions fetch --prune --unshallow - name: set variables run: | cat _out/talos-metadata >> "$GITHUB_ENV" diff --git a/.github/workflows/integration-extensions-cron.yaml b/.github/workflows/integration-extensions-cron.yaml index 474ddd26b0..b26b5b8c22 100644 --- a/.github/workflows/integration-extensions-cron.yaml +++ b/.github/workflows/integration-extensions-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-05-25T11:30:52Z by kres b5844f8. +# Generated on 2024-05-27T09:21:08Z by kres b5844f8. name: integration-extensions-cron concurrency: @@ -84,6 +84,9 @@ jobs: path: _out/extensions ref: main repository: siderolabs/extensions + - name: unshallow-extensions + run: | + git -C _out/extensions fetch --prune --unshallow - name: set variables run: | cat _out/talos-metadata >> "$GITHUB_ENV" diff --git a/.kres.yaml b/.kres.yaml index d018fffa33..e9baf88582 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -770,6 +770,9 @@ spec: repository: siderolabs/extensions ref: main path: _out/extensions + - name: unshallow-extensions + nonMakeStep: true + command: git -C _out/extensions fetch --prune --unshallow - name: set variables nonMakeStep: true command: cat _out/talos-metadata >> "$GITHUB_ENV" diff --git a/Makefile b/Makefile index 8c13a6459e..ba686820f1 100644 --- a/Makefile +++ b/Makefile @@ -524,7 +524,7 @@ provision-tests-track-%: installer-with-extensions: $(ARTIFACTS)/extensions/_out/extensions-metadata $(MAKE) image-installer \ - IMAGER_ARGS="--base-installer-image=$(REGISTRY_AND_USERNAME)/installer:$(IMAGE_TAG) $(shell cat $(ARTIFACTS)/extensions/_out/extensions-metadata | grep -vE 'tailscale|xen-guest-agent|nvidia' | xargs -n 1 echo --system-extension-image)" + IMAGER_ARGS="--base-installer-image=$(REGISTRY_AND_USERNAME)/installer:$(IMAGE_TAG) $(shell cat $(ARTIFACTS)/extensions/_out/extensions-metadata | grep -vE 'tailscale|xen-guest-agent|nvidia|vmtoolsd-guest-agent' | xargs -n 1 echo --system-extension-image)" crane push $(ARTIFACTS)/installer-amd64.tar $(REGISTRY_AND_USERNAME)/installer:$(IMAGE_TAG)-amd64-extensions echo -n "$(REGISTRY_AND_USERNAME)/installer:$(IMAGE_TAG)-amd64-extensions" | jq -Rs -f hack/test/extensions/extension-patch-filter.jq | yq eval ".[] | split_doc" -P > $(ARTIFACTS)/extensions-patch.yaml