T8364: smoke test workflow fixed review comments

2 files changed, 24 insertions, 71 deletions

diff --git a/.github/config/smoketest-branches.json b/.github/config/smoketest-branches.json
index 245cd3bb..f67f17a9 100644
--- a/.github/config/smoketest-branches.json
+++ b/.github/config/smoketest-branches.json
@@ -3,32 +3,17 @@
     "current": {
       "vyos_mirror": "https://packages.vyos.net/repositories/current/",
       "container_image": "vyos/vyos-build:current",
-      "vyos_1x_repo": "vyos/vyos-1x",
-      "use_pat": false,
-      "build_runner": ["ubuntu-24.04"],
-      "build_version_format": "%Y.%m.%d-%H%M-integration",
-      "install_build_deps": false,
-      "mirror_enabled": true
+      "use_pat": false
     },
     "circinus": {
       "vyos_mirror": "https://packages.vyos.net/repositories/circinus/",
       "container_image": "vyos/vyos-build:circinus",
-      "vyos_1x_repo": "VyOS-Networks/vyos-1x",
-      "use_pat": true,
-      "build_runner": ["self-hosted", "azure"],
-      "build_version_format": "1.5-integration-%Y%m%d%H%M",
-      "install_build_deps": true,
-      "mirror_enabled": false
+      "use_pat": true
     },
     "sagitta": {
       "vyos_mirror": "https://packages.vyos.net/repositories/sagitta/",
       "container_image": "vyos/vyos-build:sagitta",
-      "vyos_1x_repo": "VyOS-Networks/vyos-1x",
-      "use_pat": true,
-      "build_runner": ["self-hosted", "azure"],
-      "build_version_format": "1.4-integration-%Y%m%d%H%M",
-      "install_build_deps": true,
-      "mirror_enabled": false
+      "use_pat": true
     }
   }
 }
diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml
index bf11aabe..b78f8469 100644
--- a/.github/workflows/package-smoketest.yml
+++ b/.github/workflows/package-smoketest.yml
@@ -11,6 +11,8 @@ on:
       - '**'
       - '!.github/**'
       - '!**/*.md'
+      - '!scripts/package-build/**'
+      - '!docker-vyos/**'
   pull_request_target:
     branches:
       - current
@@ -20,6 +22,8 @@ on:
       - '**'
       - '!.github/**'
       - '!**/*.md'
+      - '!scripts/package-build/**'
+      - '!docker-vyos/**'
 
 permissions:
   pull-requests: write
@@ -38,12 +42,7 @@ jobs:
       branch: ${{ steps.config.outputs.branch }}
       vyos_mirror: ${{ steps.config.outputs.vyos_mirror }}
       container_image: ${{ steps.config.outputs.container_image }}
-      vyos_1x_repo: ${{ steps.config.outputs.vyos_1x_repo }}
-      build_version_format: ${{ steps.config.outputs.build_version_format }}
-      build_runner: ${{ steps.config.outputs.build_runner }}
       use_pat: ${{ steps.config.outputs.use_pat }}
-      install_build_deps: ${{ steps.config.outputs.install_build_deps }}
-      mirror_enabled: ${{ steps.config.outputs.mirror_enabled }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -67,70 +66,44 @@ jobs:
           echo "branch=${BRANCH}" >> $GITHUB_OUTPUT
           echo "vyos_mirror=$(echo $CONFIG | jq -r .vyos_mirror)" >> $GITHUB_OUTPUT
           echo "container_image=$(echo $CONFIG | jq -r .container_image)" >> $GITHUB_OUTPUT
-          echo "vyos_1x_repo=$(echo $CONFIG | jq -r .vyos_1x_repo)" >> $GITHUB_OUTPUT
-          echo "build_version_format=$(echo $CONFIG | jq -r .build_version_format)" >> $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 "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) }}
+    runs-on: ubuntu-24.04
     timeout-minutes: 45
-    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
     outputs:
       build_version: ${{ steps.version.outputs.build_version }}
     steps:
-      - name: Clone vyos-build source code
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
-          token: ${{ needs.set_config.outputs.use_pat == 'true' && secrets.PAT || secrets.GITHUB_TOKEN }}
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Clone vyos-1x source code
-        uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v6
         with:
-          path: packages/vyos-1x
-          repository: ${{ needs.set_config.outputs.vyos_1x_repo }}
-          fetch-depth: 0
-          ref: ${{ needs.set_config.outputs.branch }}
-          token: ${{ needs.set_config.outputs.use_pat == 'true' && secrets.PAT || secrets.GITHUB_TOKEN }}
-          submodules: true
-
-      - name: Build vyos-1x package
-        run: |
-          cd packages/vyos-1x
-          if [[ "${{ needs.set_config.outputs.install_build_deps }}" == "true" ]]; then
-            sudo apt-get update
-            sudo apt-get build-dep -y .
-          fi
-          dpkg-buildpackage -uc -us -tc -b
+          repository: ${{ github.repository }}
+          ref: ${{ github.ref }}
 
       - name: Generate ISO version string
         id: version
         run: |
-          echo "build_version=$(date -u +'${{ needs.set_config.outputs.build_version_format }}')" >> $GITHUB_OUTPUT
+          echo "build_version=$(date -u +'%Y.%m.%d-%H%M-integration')" >> $GITHUB_OUTPUT
 
       - name: Build custom ISO image
         shell: bash
         run: |
           sudo --preserve-env ./build-vyos-image \
           --architecture amd64 \
-          --build-by $BUILD_BY \
+          --build-by autobuild@vyos.net \
           --build-type release \
           --custom-package vyos-1x-smoketest \
-          --debian-mirror $DEBIAN_MIRROR \
-          --debian-security-mirror $DEBIAN_SECURITY_MIRROR \
+          --debian-mirror http://deb.debian.org/debian/ \
+          --debian-security-mirror http://deb.debian.org/debian-security \
           --version ${{ steps.version.outputs.build_version }} \
           --vyos-mirror ${{ needs.set_config.outputs.vyos_mirror }} \
           generic
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           retention-days: 2
           name: vyos-${{ steps.version.outputs.build_version }}
@@ -138,10 +111,6 @@ jobs:
             build/live-image-amd64.hybrid.iso
             build/manifest.json
 
-      - uses: atos-actions/clean-self-hosted-runner@v1.4.10
-        if: ${{ always() && contains(needs.set_config.outputs.build_runner, 'self-hosted') }}
-
-
   test_config_load:
     needs: [build_iso, set_config]
     runs-on: ubuntu-24.04
@@ -152,14 +121,13 @@ jobs:
     outputs:
       exit_code: ${{ steps.test.outputs.exit_code }}
     steps:
-      - name: Clone vyos-build source code
-        uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v6
         with:
-          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
-          token: ${{ needs.set_config.outputs.use_pat == 'true' && secrets.PAT || secrets.GITHUB_TOKEN }}
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          repository: ${{ github.repository }}
+          ref: ${{ github.ref }}
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           name: vyos-${{ needs.build_iso.outputs.build_version }}
           path: build
@@ -181,11 +149,11 @@ jobs:
       - test_config_load
     runs-on: ubuntu-24.04
     timeout-minutes: 5
-    if: always()
+    if: always() && github.event_name == 'pull_request_target'
     steps:
       - name: Add PR comment
         if: always() && github.event_name == 'pull_request_target'
-        uses: mshick/add-pr-comment@v2
+        uses: mshick/add-pr-comment@v3
         with:
           message: |
             CI integration ${{ (needs.test_config_load.outputs.exit_code == 'success' && '👍 passed!') || '❌ failed!' }}