Use public GitHub runners for build processparallel-runs

3 files changed, 335 insertions, 56 deletions

diff --git a/.github/workflows/vyos-rolling-nightly-build.yml b/.github/workflows/vyos-rolling-nightly-build.yml
index a12fbb0..353b369 100644
--- a/.github/workflows/vyos-rolling-nightly-build.yml
+++ b/.github/workflows/vyos-rolling-nightly-build.yml
@@ -52,7 +52,6 @@ env:
   BUILD_BY: autobuild@vyos.net
   DEBIAN_MIRROR: http://deb.debian.org/debian/
   VYOS_MIRROR: https://rolling-packages.vyos.net/current/
-  DOCKER_CALL_ON_KVM_HOST_WITH_IMAGE_PULL: docker run --rm --privileged --pull=always -v ~/vyos-build:/vyos -w /vyos vyos/vyos-build:current
 
 jobs:
   build_iso:
@@ -107,12 +106,10 @@ jobs:
       - name: Sign generic ISO image
         shell: bash
         run: |
-          ls -al
           echo "${{ secrets.minisign_private_key }}" > /tmp/minisign.key
           echo ${{ secrets.minisign_password }} | $GITHUB_WORKSPACE/bin/minisign -s /tmp/minisign.key -Sm vyos-${{ steps.set_env_variables.outputs.build_version }}-generic-amd64.iso
           echo "${{ secrets.minisign_public_key }}" > /tmp/minisign.pub
           $GITHUB_WORKSPACE/bin/minisign -Vm vyos-${{ steps.set_env_variables.outputs.build_version }}-generic-amd64.iso -x vyos-${{ steps.set_env_variables.outputs.build_version }}-generic-amd64.iso.minisig -p /tmp/minisign.pub
-          ls -al
           rm /tmp/minisign.key /tmp/minisign.pub
 
       - uses: actions/upload-artifact@v4
@@ -126,6 +123,9 @@ jobs:
     needs: build_iso
     runs-on: ubuntu-24.04
     if: ${{ !inputs.SKIP_SMOKETEST_SYSTEM }}
+    container:
+      image: vyos/vyos-build:current
+      options: --sysctl net.ipv6.conf.lo.disable_ipv6=0 --privileged
     steps:
       # We need the test script from vyos-build repo
       - name: Clone vyos-build source code
@@ -137,22 +137,26 @@ jobs:
           name: vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64
           path: build
       - name: VyOS CLI smoketests
-        uses: appleboy/ssh-action@v1.0.3
+        id: test
+        shell: bash
+        run: |
+          set -e
+          ln -s vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64.iso build/live-image-amd64.hybrid.iso
+          sudo make test | tee smoketest_make_test.log
+      - uses: actions/upload-artifact@v4
         with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          port: ${{ secrets.SSH_PORT }}
-          key: ${{ secrets.SSH_KEY }}
-          timeout: 15m
-          command_timeout: 180m
-          script_stop: true
-          script: |
-            ${{ env.DOCKER_CALL_ON_KVM_HOST_WITH_IMAGE_PULL }} /bin/bash -c "sudo make test | tee smoketest_system.log"
+          name: smoketest_make_test
+          path: smoketest_make_test.log
+          retention-days: 30
+          if-no-files-found: error
 
   test_config_load:
     needs: build_iso
     runs-on: ubuntu-24.04
     if: ${{ !inputs.SKIP_SMOKETEST_CONFIG }}
+    container:
+      image: vyos/vyos-build:current
+      options: --sysctl net.ipv6.conf.lo.disable_ipv6=0 --privileged
     steps:
       # We need the test script from vyos-build repo
       - name: Clone vyos-build source code
@@ -164,22 +168,26 @@ jobs:
           name: vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64
           path: build
       - name: VyOS config load tests
-        uses: appleboy/ssh-action@v1.0.3
+        id: test
+        shell: bash
+        run: |
+          set -e
+          ln -s vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64.iso build/live-image-amd64.hybrid.iso
+          sudo make testc | tee smoketest_make_testc.log
+      - uses: actions/upload-artifact@v4
         with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          port: ${{ secrets.SSH_PORT }}
-          key: ${{ secrets.SSH_KEY }}
-          timeout: 15m
-          command_timeout: 180m
-          script_stop: true
-          script: |
-            ${{ env.DOCKER_CALL_ON_KVM_HOST_WITH_IMAGE_PULL }} /bin/bash -c "sudo make testc | tee smoketest_configuration.log"
+          name: smoketest_make_testc
+          path: smoketest_make_testc.log
+          retention-days: 30
+          if-no-files-found: error
 
   test_raid1_install:
     needs: build_iso
     runs-on: ubuntu-24.04
     if: ${{ !inputs.SKIP_SMOKETEST_RAID1 }}
+    container:
+      image: vyos/vyos-build:current
+      options: --sysctl net.ipv6.conf.lo.disable_ipv6=0 --privileged
     steps:
       # We need the test script from vyos-build repo
       - name: Clone vyos-build source code
@@ -190,27 +198,62 @@ jobs:
         with:
           name: vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64
           path: build
-      - name: RAID1 installation tests
-        uses: appleboy/ssh-action@v1.0.3
+      - name: VyOS RAID1 installation tests
+        id: test
+        shell: bash
+        run: |
+          set -e
+          ln -s vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64.iso build/live-image-amd64.hybrid.iso
+          sudo make testraid | tee smoketest_make_testraid.log
+      - uses: actions/upload-artifact@v4
         with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          port: ${{ secrets.SSH_PORT }}
-          key: ${{ secrets.SSH_KEY }}
-          timeout: 15m
-          command_timeout: 180m
-          script_stop: true
-          script: |
-            ${{ env.DOCKER_CALL_ON_KVM_HOST_WITH_IMAGE_PULL }} /bin/bash -c "set -o pipefail && sudo make testraid | tee smoketest_raid.log"
+          name: smoketest_make_testraid
+          path: smoketest_make_testraid.log
+          retention-days: 30
+          if-no-files-found: error
+
+  test_encrypted_config_tpm:
+    needs: build_iso
+    runs-on: ubuntu-24.04
+    if: ${{ !inputs.SKIP_SMOKETEST_RAID1 }}
+    container:
+      image: vyos/vyos-build:current
+      options: --sysctl net.ipv6.conf.lo.disable_ipv6=0 --privileged
+    steps:
+      # We need the test script from vyos-build repo
+      - name: Clone vyos-build source code
+        uses: actions/checkout@v4
+        with:
+          repository: vyos/vyos-build
+      - uses: actions/download-artifact@v4
+        with:
+          name: vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64
+          path: build
+      - name: VyOS TPM encryption tests
+        id: test
+        shell: bash
+        run: |
+          set -e
+          ln -s vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64.iso build/live-image-amd64.hybrid.iso
+          sudo make testtpm | tee smoketest_make_testtpm.log
+      - uses: actions/upload-artifact@v4
+        with:
+          name: smoketest_make_testtpm
+          path: smoketest_make_testtpm.log
+          retention-days: 30
+          if-no-files-found: error
 
   publish:
     needs:
       - test_config_load
       - test_raid1_install
       - test_smoketest_cli
+      - test_encrypted_config_tpm
+      - build_iso
     runs-on: ubuntu-24.04
     permissions:
       contents: write
+    if: ${{ !inputs.SKIP_RELEASE_PUBLISHING }}
     steps:
       - uses: actions/checkout@v4
       - name: Clone vyos-build source code
@@ -227,19 +270,18 @@ jobs:
          shell: bash
          run: |
           cd vyos-build
-          echo "CHANGELOG_COMMIT_build=$(git log --since "${{ env.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }}" --format="%H" --reverse | head -n1)" >> $GITHUB_OUTPUT
+          echo "CHANGELOG_COMMIT_VYOS_BUILD=$(git log --since "${{ env.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }}" --format="%H" --reverse | head -n1)" >> $GITHUB_OUTPUT
           cd ../vyos-1x
-          echo "CHANGELOG_COMMIT_1x=$(git log --since "${{ env.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }}" --format="%H" --reverse | head -n1)" >> $GITHUB_OUTPUT
+          echo "CHANGELOG_COMMIT_VYOS_1X=$(git log --since "${{ env.PREVIOUS_SUCCESS_BUILD_TIMESTAMP }}" --format="%H" --reverse | head -n1)" >> $GITHUB_OUTPUT
 
       - name: "Release publishing: generate changelog for vyos-1x"
-        if: ${{ !inputs.SKIP_RELEASE_PUBLISHING }}
         id: generate_changelog_for_vyos-1x
         uses: mikepenz/release-changelog-builder-action@v4.1.0
         with:
           owner: "vyos"
           repo: "vyos-1x"
           fetchReviewers: false
-          fromTag: ${{ steps.commit_ids.outputs.CHANGELOG_COMMIT_1x }}
+          fromTag: ${{ steps.commit_ids.outputs.CHANGELOG_COMMIT_VYOS_1X }}
           toTag: HEAD
           configurationJson: |
             {
@@ -249,14 +291,13 @@ jobs:
             }
 
       - name: "Release publishing: generate changelog for vyos-build"
-        if: ${{ !inputs.SKIP_RELEASE_PUBLISHING && env.CHANGELOG_COMMIT_build }}
         id: generate_changelog_for_vyos-build
         uses: mikepenz/release-changelog-builder-action@v4.1.0
         with:
           owner: "vyos"
           repo: "vyos-build"
           fetchReviewers: false
-          fromTag: ${{ steps.commit_ids.outputs.CHANGELOG_COMMIT_build }}
+          fromTag: ${{ steps.commit_ids.outputs.CHANGELOG_COMMIT_VYOS_BUILD }}
           toTag: HEAD
           configurationJson: |
             {
@@ -266,20 +307,16 @@ jobs:
             }
 
       - name: "Release publishing: generate CHANGELOG.md"
-        id: generate_changelog_md
-        if: ${{ !inputs.SKIP_RELEASE_PUBLISHING }}
         run: |
           cat <<EOF > CHANGELOG.md
           ## vyos-1x
           ${{ steps.generate_changelog_for_vyos-1x.outputs.changelog }}
           ## vyos-build
-          ${{ steps.generate-build-changelog.outputs.changelog }}
+          ${{ steps.generate_changelog_for_vyos-build.outputs.changelog }}
           EOF
           cat CHANGELOG.md
 
       - name: "Release publishing: create version.json"
-        if: ${{ !inputs.SKIP_RELEASE_PUBLISHING }}
-        id: create_version_json
         uses: jsdaniell/create-json@v1.2.3
         with:
           name: "version.json"
@@ -294,23 +331,23 @@ jobs:
 
       - name: "Release publishing: check if the repository was modified during runtime to prevent autocommit failure"
         id: check_if_the_repository_was_modified_during_runtime
-        if: ${{ !inputs.SKIP_RELEASE_PUBLISHING }}
         run: |
           sudo chown -R $(whoami):$(whoami) ./*
           git pull --autostash --rebase
 
       - name: "Release publishing: create autocommit and tag"
-        id: create_autocommit_and_tag
-        if: ${{ !inputs.SKIP_RELEASE_PUBLISHING }}
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          tagging_message: vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64
-          commit_message: vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64
+          tagging_message: ${{ needs.build_iso.outputs.build_version }}
+          commit_message: ${{ needs.build_iso.outputs.build_version }}
+          commit_author: "vyosbot <${{ env.BUILD_BY }}>"
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64
 
       - name: "Release publishing: publish release"
-        id: publish_release
-        if: github.ref == 'refs/heads/main'
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body_path: CHANGELOG.md
           tag_name: ${{ needs.build_iso.outputs.build_version }}
@@ -318,3 +355,9 @@ jobs:
           files: |
             ./vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64.iso
             ./vyos-${{ needs.build_iso.outputs.build_version }}-generic-amd64.iso.minisig
+
+      - uses: Nats-ji/delete-old-releases@v1.0.1
+        with:
+          token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
+          keep-count: 30
+          keep-old-minor-releases: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ef1908..5617849 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,222 @@
 ## vyos-1x
+- T6219: Add support for container sysctl parameter
+   - PR: vyos/vyos-1x#3614
+- T6467: add PR checks workflows for sagitta branch
+   - PR: vyos/vyos-1x#3615
+- T6442: CGNAT add log for address allocation
+   - PR: vyos/vyos-1x#3621
+- T6469: remove j2 lint workflow
+   - PR: vyos/vyos-1x#3626
+- op-mode: T6471: add optimized get_config_dict
+   - PR: vyos/vyos-1x#3628
+- firewall: T3900: fix migration and smoketests
+   - PR: vyos/vyos-1x#3632
+- bgp: T6473: missing completion helper for peer-groups inside a VRF
+   - PR: vyos/vyos-1x#3638
+- T6476: added sonarcloud workflow
+   - PR: vyos/vyos-1x#3642
+- op_mode: T6227:  Rewrite show conntrack-sync cache internal to use tabulate output
+   - PR: vyos/vyos-1x#3644
+- openvpn: T5487:  Remove deprecated option --cipher for server and client mode
+   - PR: vyos/vyos-1x#3639
+- T6487: updated central workflows to use current branch
+   - PR: vyos/vyos-1x#3647
+- op-mode: T6407: "generate pki" missed to mangle in ACME certificates when required
+   - PR: vyos/vyos-1x#3646
+- op-mode: T6480: must call pki.py helper as root to work with ACME certificates
+   - PR: vyos/vyos-1x#3645
+- openvpn: T5487: make migration script executable
+   - PR: vyos/vyos-1x#3653
+- openvpn: T5487:  Fix migration smoketests commands
+   - PR: vyos/vyos-1x#3659
+- T6494: Update sonarcloud.yml and add more branches for scanning
+   - PR: vyos/vyos-1x#3661
+- sonarcloud: Revert "T6494: Update sonarcloud.yml and add more branches for scanning"
+   - PR: vyos/vyos-1x#3663
+- wireless: T6318: move country-code to a system wide configuration
+   - PR: vyos/vyos-1x#3656
+- pki: T4026: Only emit private keys when available
+   - PR: vyos/vyos-1x#3655
+- pki: T6241: remove debug print statement about updated subsystems
+   - PR: vyos/vyos-1x#3657
+- wireless: T6318: add quotes for console speed in config-tests
+   - PR: vyos/vyos-1x#3675
+- T6489: Add support for CLI config scripts that change the underlaying working configuration
+   - PR: vyos/vyos-1x#3652
+- T6492: Check if all migrators have the executable bit set
+   - PR: vyos/vyos-1x#3678
+- T6497: CGNAT delete conntrack entries if a pool is modified
+   - PR: vyos/vyos-1x#3680
+- macsec: T5447: fix error message syntax - there is no tx and rx key, only key
+   - PR: vyos/vyos-1x#3685
+- openconnect: T6500: add support for multiple ca-certificates
+   - PR: vyos/vyos-1x#3682
+- T5949: Add option to disable USB autosuspend
+   - PR: vyos/vyos-1x#3677
+- T3900: firewall: fix for initial implementation
+   - PR: vyos/vyos-1x#3693
+- op-mode: T5514: Allow safe reboots to config defaults when config.boot is deleted
+   - PR: vyos/vyos-1x#3654
+- snmp: T6489: use new Python wrapper to interact with config filesystem
+   - PR: vyos/vyos-1x#3694
+- op mode: T6498: move uptime helpers to vyos.utils.system
+   - PR: vyos/vyos-1x#3684
+- op-mode: T6503: "restart ssh" command not working
+   - PR: vyos/vyos-1x#3702
+- GitHub: T6494: add workflow to build custom ISO for integration tests
+   - PR: vyos/vyos-1x#3703
+- T3202: Enable wireguard debug messages
+   - PR: vyos/vyos-1x#3679
+- T6511: add circinus branch to workflow
+   - PR: vyos/vyos-1x#3710
+- op mode: T6501: add "run show kernel modules"
+   - PR: vyos/vyos-1x#3683
+- configd: T6504: send sudo_user on session init and set env variable
+   - PR: vyos/vyos-1x#3701
+- op-mode: T6514: rework the "show system storage" code to handle live CD systems correctly
+   - PR: vyos/vyos-1x#3718
+- T3900: extend latest fix for firewall raw implementation to ipv6.
+   - PR: vyos/vyos-1x#3722
+- GitHub: T6494: extend ISO integration workflow
+   - PR: vyos/vyos-1x#3714
+- interfaces: T6519: harden config migration if ethernet interface is missing
+   - PR: vyos/vyos-1x#3724
+- T6520: added PR write permissions for smoke test workflow
+   - PR: vyos/vyos-1x#3728
+- T6510: smoketest: generell improvement task for the smoketesting platform
+   - PR: vyos/vyos-1x#3727
+- smoketest: T6510: remove build time test to check for /dev/input/event0
+   - PR: vyos/vyos-1x#3729
+- T6007: revise migration system
+   - PR: vyos/vyos-1x#3692
+- T6313: Add "NAT" to "generate" command for rule resequence
+   - PR: vyos/vyos-1x#3715
+- T6497: CGNAT refactoring delete conntrack entries
+   - PR: vyos/vyos-1x#3699
+- T6488: firewall: extend op-mode command to show global state-policy counters
+   - PR: vyos/vyos-1x#3681
+- op-mode: T5633, T6465: fix error when op cmd interrupted, updates some system call syntax
+   - PR: vyos/vyos-1x#3731
+- pppoe-server: T5710: Add option permit any-login
+   - PR: vyos/vyos-1x#3730
+- T6477: Add telegraf loki output plugin
+   - PR: vyos/vyos-1x#3720
+- utils: T6530: add a helper for easily calling iproute2 commands
+   - PR: vyos/vyos-1x#3737
+- op-mode: T6524: rewrite "release dhcp(v6) interface" to new op-mode format
+   - PR: vyos/vyos-1x#3733
+- T6534: fix incorrect imports in vyos-config-encrypt.py
+   - PR: vyos/vyos-1x#3743
+- T6523: Telegraf use nft scripts only if the firewall configured
+   - PR: vyos/vyos-1x#3748
+- T6527: add legacy Vyatta interpreter files still in use
+   - PR: vyos/vyos-1x#3745
+- ssh: T5878: Allow changing the PubkeyAcceptedAlgorithms option
+   - PR: vyos/vyos-1x#3721
+- GitHub: T6494: add consolidated ISO test result comment on PR
+   - PR: vyos/vyos-1x#3750
+- T6538: Add the ability to set GENEVE interfaces to VRF
+   - PR: vyos/vyos-1x#3752
+- op-mode: T6498: add machine-readable tech support report script
+   - PR: vyos/vyos-1x#3746
+- T6536: nat: add migration script that replaces wildcard charater
+   - PR: vyos/vyos-1x#3749
+- syslog: T5366: remove reference to deprecated sysvinit rsyslog script
+   - PR: vyos/vyos-1x#3760
+- T6546: unused import check permission update
+   - PR: vyos/vyos-1x#3769
+- op-mode: T6537: include hostname in the reboot/shutdown warning message
+   - PR: vyos/vyos-1x#3767
+- vyos_net_name: T6544: Updated the  script
+   - PR: vyos/vyos-1x#3776
+- op-mode: T6371: fix output of NAT rules with single port range
+   - PR: vyos/vyos-1x#3778
+- T6539: add logging options to load-balancer reverse-proxy
+   - PR: vyos/vyos-1x#3753
+- wireless: T4287: use upstream regulatory database due to kernel signing
+   - PR: vyos/vyos-1x#3777
+- wireless: T4287: use Debian postinst over preinst when using update-alternatives
+   - PR: vyos/vyos-1x#3782
+- migration: T6007: add missing check for None in utility function
+   - PR: vyos/vyos-1x#3788
+- T6556: workflow trigger branches cleanup
+   - PR: vyos/vyos-1x#3784
+- T6496: Added support for WPA-Enterprise client-mode
+   - PR: vyos/vyos-1x#3711
+- T6556: pull_request_target update in unused import
+   - PR: vyos/vyos-1x#3792
+- GitHub: T6494: do not use 0/null value to mark build succeed
+   - PR: vyos/vyos-1x#3789
+- smoketest: T6539: remove explicit test for non existing global log entry
+   - PR: vyos/vyos-1x#3790
+- op-mode: T6537: remove unused cmd imported from vyos.utils.process
+   - PR: vyos/vyos-1x#3791
+- T6560: added workflow trigger path restrictions
+   - PR: vyos/vyos-1x#3799
+- vxlan: T6505: Support VXLAN VLAN-VNI range mapping in CLI
+   - PR: vyos/vyos-1x#3756
+- op-mode: T6566: add support for listing all interfaces in "monitor bandwidth"
+   - PR: vyos/vyos-1x#3805
+- firewall: T6581: fix completion for "show firewall ... rule"
+   - PR: vyos/vyos-1x#3812
+- configdep: T6559: fix regression in dependent script error under configd
+   - PR: vyos/vyos-1x#3813
+- op-mode: T6575: add support for NTP service restart via CLI
+   - PR: vyos/vyos-1x#3810
+- ruff: T6583: Added settings for ruff
+   - PR: vyos/vyos-1x#3816
+- T6572: added trigger pr caller workflow
+   - PR: vyos/vyos-1x#3809
+- op-mode: T6577: create generic service restart helper to work with the API
+   - PR: vyos/vyos-1x#3817
+- op-mode: T6580: read active nodes directly from the config tree without calling cli-shell-api
+   - PR: vyos/vyos-1x#3811
+- T6590: rebase label worflow added
+   - PR: vyos/vyos-1x#3820
+- op-mode: T6586: add a distinct exception for unconfigured objects (as opposed to entire subsystems)
+   - PR: vyos/vyos-1x#3818
+- openvpn: T6591: deprecate OpenVPN server net30 topology
+   - PR: vyos/vyos-1x#3825
+- T6578: Fix unhandled exception in "show openconnect-server sessions"
+   - PR: vyos/vyos-1x#3828
+- GitHub: T6590: normalize LF in rebase label worflow file
+   - PR: vyos/vyos-1x#3835
+- interfaces: T6592: moving an interface between VRF instances failed
+   - PR: vyos/vyos-1x#3834
+- smoketest: T6600: ospf: enable MPLS LDP on dummy interfaces
+   - PR: vyos/vyos-1x#3838
+- T6599: ipsec: support disabling rekey of CHILD_SA, converge and fix defaults
+   - PR: vyos/vyos-1x#3841
+- wireless: T6597: improve hostapd startup and corresponding smoketests
+   - PR: vyos/vyos-1x#3833
+- vrf: T6592: remove unused import get_interface_config
+   - PR: vyos/vyos-1x#3839
+- T6594: Add missed pppd_compat module
+   - PR: vyos/vyos-1x#3832
+- openvpn: T3834: verify() is not allowed to change anything on the system
+   - PR: vyos/vyos-1x#3850
+- T6525: Add default dir for ext-scripts without absolute path
+   - PR: vyos/vyos-1x#3827
+- T6589: Return a dict when querying information about a single interface
+   - PR: vyos/vyos-1x#3840
+- system_option: T5552: Apply IPv4 and IPv6 options after reapplying sysctls by TuneD
+   - PR: vyos/vyos-1x#3853
+- op_mode: T6596: pppoe operation command failed
+   - PR: vyos/vyos-1x#3860
+- op_mode: T6593: Release DHCP interface does not work
+   - PR: vyos/vyos-1x#3861
+- vrf: T6602: verify supplied VRF name on all interface types
+   - PR: vyos/vyos-1x#3856
+- interface: T6592: remove interface from conntrack ct_iface_map on deletion
+   - PR: vyos/vyos-1x#3857
+- T6605: restore configd error formatting to be consistent with CLI
+   - PR: vyos/vyos-1x#3868
+- Debian: T6598: depend on podman version >=4.9.5
+   - PR: vyos/vyos-1x#3873
 - op_mode: T5744: PKI import OpenVPN shared key includess unexpected BEGIN and END
    - PR: vyos/vyos-1x#3879
+- firewall: T4694: Adding rt ipsec exists/missing match to firewall configs
+   - PR: vyos/vyos-1x#3616
 - ipsec: T6148: Fixed reset command by adding init after terminating
    - PR: vyos/vyos-1x#3763
 - smoketest: T5705: use locally connected remote syslog servers
@@ -19,6 +235,26 @@
    - PR: vyos/vyos-1x#3804
 - vyos.configtree: T6620: allow list_nodes() to work on non-existent paths
    - PR: vyos/vyos-1x#3898
+- pbr: T6430: Allow forwarding into VRFs by name as well as route table IDs
+   - PR: vyos/vyos-1x#3740
+- vrf: T6603: conntrack ct_iface_map must only contain one entry for iifname/oifname
+   - PR: vyos/vyos-1x#3883
+- T6572: trigger remote pr only for circinus pr merge
+   - PR: vyos/vyos-1x#3899
+- system: op-mode: T3334: allow delayed getty restart when configuring serial ports
+   - PR: vyos/vyos-1x#3698
+- T6486: T6379: Rewrite generate openvpn client-config
+   - PR: vyos/vyos-1x#3747
+- GitHub: T6560: action must be run on forked repo
+   - PR: vyos/vyos-1x#3902
+- ipsec: T6148: Removed unused imports
+   - PR: vyos/vyos-1x#3915
+- T5657: Add VRF support for zabbix-agent
+   - PR: vyos/vyos-1x#3919
+- T6617: T6618: vpn ipsec remote-access: fix profile generators
+   - PR: vyos/vyos-1x#3903
+- console: T3334: remove unused directories imported from vyos.defaults
+   - PR: vyos/vyos-1x#3923
 
 
 ## vyos-build
diff --git a/version.json b/version.json
index 5695cb7..5ffd50e 100644
--- a/version.json
+++ b/version.json
@@ -1,7 +1,7 @@
 [
   {
-    "url": "https://github.com/vyos/vyos-rolling-nightly-builds/releases/download/1.5-rolling-202407300021/vyos-1.5-rolling-202407300021-amd64.iso",
-    "version": "1.5-rolling-202407300021",
-    "timestamp": "2024-07-30T00:21:24Z"
+    "url": "https://github.com/vyos/vyos-rolling-nightly-builds/releases/download/vyos--generic-amd64/vyos--generic-amd64.iso",
+    "version": "",
+    "timestamp": ""
   }
 ]
\ No newline at end of file