Skip to content

Commit

Permalink
chore(ci): fix integration extensions
Browse files Browse the repository at this point in the history
Now that extensions run the `extensions-validator` we need to fetch proper tags.

Signed-off-by: Noel Georgi <[email protected]>
  • Loading branch information
frezbo committed May 27, 2024
1 parent de7553d commit 7b37e5b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/integration-extensions-cron.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7b37e5b

Please sign in to comment.