[READY] - openwrt build follow up and github actions #817

sarcasticadmin · 2025-01-27T04:04:35Z

Description of PR

Relates to: #808
Fixes: #818

Follow up to: #814 #815 (since both merged prematurely) and fixing some things in github actions

Old Behavior

existing openwrt-build github action is failing due to incorrect user id
github actions: uplaod-artifacts@v3.x
templates had instructions that would render if not deleted before posting
github removed one of our tokens named: GITHUB_* (which is now unusable due to naming requirements of env vars)

New Behavior

github action for openwrt-build set back to 1001 for user id
updating our env var for github action trigger to gitlab. Can completely confirm this functionality until merged to master
github action: upload-artifacts needs to be bumped ahead of deprecation deprecation notice: v1, v2, and v3 of the artifact github actions #818
Updated our templates so the instructions dont have to be removed when filling them out, exactly how nixpkgs works: https://github.com/NixOS/nixpkgs/blob/d8a92f0cf1c9e4825bd71b7e614a6b4063dba39c/.github/PULL_REQUEST_TEMPLATE.md

Tests

github action builds are working: https://github.com/socallinuxexpo/scale-network/actions/runs/13064758530
gitlab runner with autoflash of the above image on ath79 (netgear wndr3800ch) is working: https://gitlab.com/socallinuxexpo/scale-network/-/jobs/8968109863
- There is a slight issue with 2 of the tests which appear to be problem with the SHELL (/bin/sh) that comes on this build. I suspect theres something either related to /bin/sh being symlinked to /bin/dash or busybox oddities. This actually might just be an issue with the version of serverspec and ruby gems since using the nix devshell seems to work on the same build:

$ rake spec TEST_TYPE=openwrt TARGET_HOST=192.168.254.113
/nix/store/xkmg185m7hv3c5dv6dsbmfs1c5vf92p6-ruby-3.1.6/bin/ruby -I/nix/store/7fl8vynr2x1vfi1d2slvhp07nmdhby35-serverspec/lib/ruby/gems/3.1.0/gems/rspec-core-3.12.2/lib:/nix/store/7fl8vynr2x1vfi1d2slvhp07nmdhby35-serverspec/lib/ruby/gems/3.1.0/gems/rspec-support-3.12.1/lib /nix/store/h751jn4jignpp48d60wlpq05ariv18r6-ruby3.1-rspec-core-3.12.2/lib/ruby/gems/3.1.0/gems/rspec-core-3.12.2/exe/rspec --pattern spec/openwrt/\*_spec.rb

Image info:
Linux OpenWrt 6.6.68 #0 Mon Jan 27 16:23:54 2025 mips GNU/Linux
SCALE_VER=fd9d58a6b451f6a2d5384f7c978cdad34046a810
OPENWRT_VER=c8ea1aa970bf5a0275e3b0b7da777e804821ddcd
BUILD_ID="r0-fd9d58a"
OPENWRT_BOARD="ath79/generic"
OPENWRT_ARCH="mips_24kc"

shared
  Command "which apinger 2> /dev/null"
    exit_status
      is expected to eq 0
  Command "which awk 2> /dev/null"
    exit_status
      is expected to eq 0
  Command "which bash 2> /dev/null"
    exit_status
      is expected to eq 0
  Command "which logrotate 2> /dev/null"
    exit_status
      is expected to eq 0
  Command "which rsyslogd 2> /dev/null"
    exit_status
      is expected to eq 0
  Command "which tcpdump 2> /dev/null"
    exit_status
      is expected to eq 0
  Command "which snmpd 2> /dev/null"
    exit_status
      is expected to eq 1
  Command "which dropbear 2> /dev/null"
    exit_status
      is expected to eq 1
  Command "which logd 2> /dev/null"
    exit_status
      is expected to eq 1
  Command "pgrep apinger"
    exit_status
      is expected to eq 0
  Command "pgrep crond"
    exit_status
      is expected to eq 0
  Command "pgrep rsyslogd"
    exit_status
      is expected to eq 0
  Command "pgrep lldpd"
    exit_status
      is expected to eq 0
  Command "pgrep ntpd"
    exit_status
      is expected to eq 0
  Port "80"
    is expected not to be listening
  Port "9100"
    is expected to be listening
  Command "rsyslogd -N1"
    exit_status
      is expected to eq 0
  Command "logger "serverspec test msg""
    exit_status
      is expected to eq 0
  File "/root/bin/wifi-details.sh"
    is expected to exist
    is expected to be mode 750
    is expected to be owned by "root"
    is expected to be grouped into "root"
  File "/root/bin/config-version.sh"
    is expected to exist
    is expected to be mode 750
    is expected to be owned by "root"
    is expected to be grouped into "root"
  Command "/root/bin/config-version.sh"
    exit_status
      is expected to eq 0
  Command "/root/bin/config-version.sh -c 9999"
    exit_status
      is expected to eq 1
  File "/etc/scale-release"
    is expected to exist
    is expected to be mode 644
    is expected to be owned by "root"
    is expected to be grouped into "root"
  Command "source /etc/scale-release && test -z $SCALE_VER"
    exit_status
      is expected to eq 1
  Command "source /etc/scale-release && test -z $OPENWRT_VER"
    exit_status
      is expected to eq 1
  File "/tmp/resolv.conf.d/resolv.conf.auto"
    is expected to exist
    is expected to be mode 644
    is expected to be owned by "root"
    is expected to be grouped into "root"
  File "/etc/resolv.conf"
    is expected to exist
    is expected to be symlink
    is expected to be owned by "root"
    is expected to be grouped into "root"
  File "/etc/config/network"
    is expected to exist
    is expected to be symlink
    is expected to be owned by "root"
    is expected to be grouped into "root"
  File "/etc/config/wireless"
    is expected to exist
    is expected to be symlink
    is expected to be owned by "root"
    is expected to be grouped into "root"
  correct_num_configs
    should always be equal
  ensure_dhcp_client_options
    should contain the following options
  Command "cat /etc/apinger.conf | grep "^target \"$(ip route | grep default | cut -d ' ' -f 3)\"""
    exit_status
      is expected to eq 0
  Command "wifi status | jq '.[] | select(.up == false )' | wc -l"
    stdout
      is expected to eq "0\n"
  Command "awk -F: -v user='root' '$1 == user {print $NF}' /etc/passwd"
    stdout
      is expected to match /\/bin\/bash/
  ensure_admin_ssh_key_present
    should match the following key fingerprint

Finished in 12.22 seconds (files took 2.07 seconds to load)
56 examples, 0 failures

Regardless these 2 failed tests are actually passing upon further inspection

sarcasticadmin · 2025-01-28T06:13:13Z

/tux openwrt flash 70-caravan-baboon

github-actions · 2025-01-28T06:13:44Z

[FAIL] - Error triggering gitlab flash pipeline

sarcasticadmin · 2025-01-28T06:18:17Z

/tux openwrt flash 70-caravan-baboon

github-actions · 2025-01-28T06:18:50Z

[FAIL] - Error triggering gitlab flash pipeline

I was expecting this to be 1000 like it is when I run the container locally but I guess inside github actions its actually 1001.

sarcasticadmin · 2025-01-31T01:51:18Z

.github/workflows/trigger.yml

@@ -29,7 +29,7 @@ jobs:
          # is not a PR event
          REF=$(curl -sSf \
            --url ${{ steps.pr-standardize-comment.outputs.url }} \
-            --header 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
+            --header 'Authorization: Bearer ${{ secrets.SCALE_GITHUB_TOKEN }}' \


I cant test this further until it lands in master for the PR comment trigger to gitlab-ci, will do a follow up after we merge this though

sarcasticadmin

Will be fixing magic cache as a separate PR since we have a few more days to decide.

.github/workflows/openwrt-build.yml

djacu · 2025-02-01T19:21:02Z

.github/workflows/openwrt-build.yml

      - name: 'Upload openwrt build log'
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4.6.0


It's probably never going to happen but do we want to use if-no-files-found: just in case?

Added this to both jobs

djacu

lgtm

sarcasticadmin force-pushed the rh/issue-808-redux branch from ee39c8e to fd9d58a Compare January 27, 2025 16:23

sarcasticadmin changed the title ~~[WAIT] - remove openwrt-build.yml docker user~~ [WAIT] - openwrt build follow up Jan 29, 2025

sarcasticadmin added 7 commits January 31, 2025 01:40

github: run openwrt-build container userid: 1001

c144bd6

I was expecting this to be 1000 like it is when I run the container locally but I guess inside github actions its actually 1001.

github: secrets can no longer start with GITHUB*

8179a0b

github: comment issue template so instructions arent rendered

7cbd3ee

github: comment pr template so instructions arent rendered

31dc3a0

github: comment pr template so instructions arent rendered

096ac79

github: use upload-artifact@v4 ahead of deprecation

d26eb1a

github: set compression to level 0 for tar.gz artifacts

13ff32b

sarcasticadmin force-pushed the rh/issue-808-redux branch from 372c2e9 to 5a965be Compare January 31, 2025 01:41

sarcasticadmin changed the title ~~[WAIT] - openwrt build follow up~~ [WAIT] - openwrt build follow up and github actions Jan 31, 2025

sarcasticadmin commented Jan 31, 2025

View reviewed changes

sarcasticadmin changed the title ~~[WAIT] - openwrt build follow up and github actions~~ [READY] - openwrt build follow up and github actions Jan 31, 2025

sarcasticadmin requested review from djacu, ruebenramirez, owendelong and kylerisse January 31, 2025 08:25

djacu reviewed Feb 1, 2025

View reviewed changes

sarcasticadmin added 2 commits February 1, 2025 20:51

github: ensure artifacts are always overwritten

1bc4945

github: error when no files found

03b364e

sarcasticadmin force-pushed the rh/issue-808-redux branch from 5a965be to 03b364e Compare February 1, 2025 20:51

djacu approved these changes Feb 1, 2025

View reviewed changes

sarcasticadmin merged commit db3a7cb into master Feb 1, 2025
6 checks passed

sarcasticadmin deleted the rh/issue-808-redux branch February 1, 2025 21:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[READY] - openwrt build follow up and github actions #817

[READY] - openwrt build follow up and github actions #817

sarcasticadmin commented Jan 27, 2025 •

edited

Loading

sarcasticadmin commented Jan 28, 2025

github-actions bot commented Jan 28, 2025

sarcasticadmin commented Jan 28, 2025

github-actions bot commented Jan 28, 2025

sarcasticadmin Jan 31, 2025

sarcasticadmin left a comment

djacu Feb 1, 2025

sarcasticadmin Feb 1, 2025

djacu left a comment

[READY] - openwrt build follow up and github actions #817

[READY] - openwrt build follow up and github actions #817

Conversation

sarcasticadmin commented Jan 27, 2025 • edited Loading

Description of PR

Old Behavior

New Behavior

Tests

sarcasticadmin commented Jan 28, 2025

github-actions bot commented Jan 28, 2025

sarcasticadmin commented Jan 28, 2025

github-actions bot commented Jan 28, 2025

sarcasticadmin Jan 31, 2025

Choose a reason for hiding this comment

sarcasticadmin left a comment

Choose a reason for hiding this comment

djacu Feb 1, 2025

Choose a reason for hiding this comment

sarcasticadmin Feb 1, 2025

Choose a reason for hiding this comment

djacu left a comment

Choose a reason for hiding this comment

sarcasticadmin commented Jan 27, 2025 •

edited

Loading