diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-01-01 20:58:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-01 20:58:19 +0100 |
| commit | 76830afc8703a3f9f6be7500cb92aa9b6e255425 (patch) | |
| tree | cc6e3736e8c8f9f8b688bc2fe85ac5ff4f36d478 /.github | |
| parent | 9b7a838d71c15afbf91c584e7017e1c44ef191d5 (diff) | |
| parent | 6bae9d4707e61d600283c07ac26114185775b606 (diff) | |
| download | vyos-1x-76830afc8703a3f9f6be7500cb92aa9b6e255425.tar.gz vyos-1x-76830afc8703a3f9f6be7500cb92aa9b6e255425.zip | |
Merge pull request #4926 from kumvijaya/current
T8100: smoke test workflow fixed whitespace handling with json
Diffstat (limited to '.github')
| -rw-r--r-- | .github/config/smoketest-branches.json | 9 | ||||
| -rw-r--r-- | .github/workflows/package-smoketest.yml | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/.github/config/smoketest-branches.json b/.github/config/smoketest-branches.json index 79b519221..7675f3088 100644 --- a/.github/config/smoketest-branches.json +++ b/.github/config/smoketest-branches.json @@ -11,7 +11,8 @@ "test_cli_command": "test-no-interfaces-no-vpp", "test_tpm_tests": true, "test_vpp": true, - "test_vpp_runner": ["ubuntu-24.04"] + "test_vpp_runner": ["ubuntu-24.04"], + "mirror_enabled": true }, "circinus": { "vyos_mirror": "https://packages.vyos.net/repositories/circinus/", @@ -24,7 +25,8 @@ "test_cli_command": "test-no-interfaces-no-vpp", "test_tpm_tests": true, "test_vpp": true, - "test_vpp_runner": ["self-hosted", "vpp"] + "test_vpp_runner": ["self-hosted", "vpp"], + "mirror_enabled": false }, "sagitta": { "vyos_mirror": "https://packages.vyos.net/repositories/sagitta/", @@ -36,7 +38,8 @@ "install_build_deps": true, "test_cli_command": "test-no-interfaces", "test_tpm_tests": false, - "test_vpp": false + "test_vpp": false, + "mirror_enabled": false } } } diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml index 9e3c2ede1..bb8b9319d 100644 --- a/.github/workflows/package-smoketest.yml +++ b/.github/workflows/package-smoketest.yml @@ -47,6 +47,7 @@ jobs: test_vpp: ${{ steps.config.outputs.test_vpp }} test_vpp_runner: ${{ steps.config.outputs.test_vpp_runner }} install_build_deps: ${{ steps.config.outputs.install_build_deps }} + mirror_enabled: ${{ steps.config.outputs.mirror_enabled }} steps: - name: Checkout repository uses: actions/checkout@v4 @@ -72,19 +73,20 @@ jobs: echo "container_image=$(echo $CONFIG | jq -r .container_image)" >> $GITHUB_OUTPUT echo "vyos_build_repo=$(echo $CONFIG | jq -r .vyos_build_repo)" >> $GITHUB_OUTPUT echo "build_version_format=$(echo $CONFIG | jq -r .build_version_format)" >> $GITHUB_OUTPUT - echo "build_runner=$(echo $CONFIG | jq -r .build_runner)" >> $GITHUB_OUTPUT + echo "build_runner=$(echo $CONFIG | jq -c .build_runner)" >> $GITHUB_OUTPUT echo "use_pat=$(echo $CONFIG | jq -r .use_pat)" >> $GITHUB_OUTPUT echo "test_cli_command=$(echo $CONFIG | jq -r .test_cli_command)" >> $GITHUB_OUTPUT echo "test_tpm_tests=$(echo $CONFIG | jq -r .test_tpm_tests)" >> $GITHUB_OUTPUT echo "test_vpp=$(echo $CONFIG | jq -r .test_vpp)" >> $GITHUB_OUTPUT - echo "test_vpp_runner=$(echo $CONFIG | jq -r .test_vpp_runner)" >> $GITHUB_OUTPUT + echo "test_vpp_runner=$(echo $CONFIG | jq -c .test_vpp_runner)" >> $GITHUB_OUTPUT echo "install_build_deps=$(echo $CONFIG | jq -r .install_build_deps)" >> $GITHUB_OUTPUT + echo "mirror_enabled=$(echo $CONFIG | jq -r .mirror_enabled)" >> $GITHUB_OUTPUT build_iso: needs: set_config runs-on: ${{ fromJson(needs.set_config.outputs.build_runner) }} timeout-minutes: 45 - if: github.repository == 'vyos/vyos-1x' + if: ${{ needs.set_config.outputs.mirror_enabled == 'false' || (needs.set_config.outputs.mirror_enabled == 'true' && github.repository_owner == 'vyos') }} container: image: ${{ needs.set_config.outputs.container_image }} options: --sysctl net.ipv6.conf.lo.disable_ipv6=0 --privileged |