summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-09-26 12:09:06 +0200
committerChristian Breunig <christian@breunig.cc>2026-09-26 12:09:06 +0200
commite7d56bddfc6e2febda1d07997b4a3e7ac22c53c4 (patch)
treebdcc220aa3f100d45fdbb50058896bd09683307b
parentb2eeeb27c768a3ab25ea9314d2f2aab7fe01d0e0 (diff)
downloadvyos-1x-e7d56bddfc6e2febda1d07997b4a3e7ac22c53c4.tar.gz
vyos-1x-e7d56bddfc6e2febda1d07997b4a3e7ac22c53c4.zip
GitHub: T9215: upload integration ISO under its real filename
The integration artifact shipped build/live-image-amd64.hybrid.iso, so every downloaded integration ZIP unpacked to the same generic name and multiple ISOs could not be told apart. Upload the ISO assembled by build-vyos-image instead (vyos-<version>-<flavor>-amd64.iso) and let the test stages locate it and pass it to make via ISO_PATH.
-rw-r--r--.github/workflows/package-smoketest.yml44
1 files changed, 36 insertions, 8 deletions
diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml
index c25034141..456302163 100644
--- a/.github/workflows/package-smoketest.yml
+++ b/.github/workflows/package-smoketest.yml
@@ -193,7 +193,7 @@ jobs:
retention-days: 2
name: vyos-${{ steps.version.outputs.build_version }}
path: |
- build/live-image-amd64.hybrid.iso
+ build/vyos-*-amd64.iso
build/manifest.json
- uses: atos-actions/clean-self-hosted-runner@v1.4.10
@@ -221,11 +221,15 @@ jobs:
name: vyos-${{ needs.build_iso.outputs.build_version }}
path: build
+ - name: Locate ISO image
+ shell: bash
+ run: echo "iso_path=$(ls build/vyos-*-amd64.iso | head -n1)" >> $GITHUB_ENV
+
- name: VyOS CLI smoketests (no interfaces)
id: test
shell: bash
run: |
- if sudo make ${{ needs.set_config.outputs.test_cli_command }}; then
+ if sudo make ISO_PATH="$iso_path" ${{ needs.set_config.outputs.test_cli_command }}; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
@@ -255,11 +259,15 @@ jobs:
name: vyos-${{ needs.build_iso.outputs.build_version }}
path: build
+ - name: Locate ISO image
+ shell: bash
+ run: echo "iso_path=$(ls build/vyos-*-amd64.iso | head -n1)" >> $GITHUB_ENV
+
- name: VyOS CLI smoketests VPP
id: test
shell: bash
run: |
- if sudo make test-vpp; then
+ if sudo make ISO_PATH="$iso_path" test-vpp; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
@@ -288,11 +296,15 @@ jobs:
name: vyos-${{ needs.build_iso.outputs.build_version }}
path: build
+ - name: Locate ISO image
+ shell: bash
+ run: echo "iso_path=$(ls build/vyos-*-amd64.iso | head -n1)" >> $GITHUB_ENV
+
- name: VyOS CLI smoketests (interfaces only)
id: test
shell: bash
run: |
- if sudo make test-interfaces; then
+ if sudo make ISO_PATH="$iso_path" test-interfaces; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
@@ -321,11 +333,15 @@ jobs:
name: vyos-${{ needs.build_iso.outputs.build_version }}
path: build
+ - name: Locate ISO image
+ shell: bash
+ run: echo "iso_path=$(ls build/vyos-*-amd64.iso | head -n1)" >> $GITHUB_ENV
+
- name: VyOS config load tests
id: test
shell: bash
run: |
- if sudo make testc; then
+ if sudo make ISO_PATH="$iso_path" testc; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
@@ -355,11 +371,15 @@ jobs:
name: vyos-${{ needs.build_iso.outputs.build_version }}
path: build
+ - name: Locate ISO image
+ shell: bash
+ run: echo "iso_path=$(ls build/vyos-*-amd64.iso | head -n1)" >> $GITHUB_ENV
+
- name: VyOS config load tests VPP
id: test
shell: bash
run: |
- if sudo make testcvpp; then
+ if sudo make ISO_PATH="$iso_path" testcvpp; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
@@ -388,11 +408,15 @@ jobs:
name: vyos-${{ needs.build_iso.outputs.build_version }}
path: build
+ - name: Locate ISO image
+ shell: bash
+ run: echo "iso_path=$(ls build/vyos-*-amd64.iso | head -n1)" >> $GITHUB_ENV
+
- name: VyOS RAID1 installation tests
id: test
shell: bash
run: |
- if sudo make testraid; then
+ if sudo make ISO_PATH="$iso_path" testraid; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT
@@ -422,11 +446,15 @@ jobs:
name: vyos-${{ needs.build_iso.outputs.build_version }}
path: build
+ - name: Locate ISO image
+ shell: bash
+ run: echo "iso_path=$(ls build/vyos-*-amd64.iso | head -n1)" >> $GITHUB_ENV
+
- name: VyOS TPM encryption tests
id: test
shell: bash
run: |
- if sudo make testtpm; then
+ if sudo make ISO_PATH="$iso_path" testtpm; then
echo "exit_code=success" >> $GITHUB_OUTPUT
else
echo "exit_code=fail" >> $GITHUB_OUTPUT