From 6b0577582d96e6b50fff7de67aa526f680b0da08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 11 Sep 2022 18:50:44 +0200 Subject: [PATCH 01/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 43 ++++++------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 99a9beb8d..4846d388c 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -15,20 +15,15 @@ on: jobs: gradle: - if: ${{ github.repository_owner }} strategy: fail-fast: false max-parallel: 8 matrix: - #board: [uefi-x86,uefi-arm64] board: [uefi-x86] target: ["debian:bullseye:10","debian:sid:12","ubuntu:focal:8","ubuntu:jammy:12"] - #target: ["debian:bullseye:10","ubuntu:jammy:12"] - desktop: [xfce,gnome,mate,cinnamon,budgie,kde-plasma] name: Make - runs-on: ${{ inputs.runner }} - #runs-on: big + runs-on: ubuntu-latest steps: - name: Runner prepare @@ -67,13 +62,6 @@ jobs: echo "DOCKER_RELEASE=$DOCKER_RELEASE" >> $GITHUB_ENV echo "DOCKER_COMPILER=$DOCKER_COMPILER" >> $GITHUB_ENV -# - name: Handle exceptions -# run: | -# -# if [[ "${{ env.DISTRO }}" == "debian" && "${{ env.BOARD }}" == "rpi4b" ]]; then -# echo "SKIP=yes" >> $GITHUB_ENV -# fi - - run: | REFERENCE=${{ inputs.reference }} @@ -150,28 +138,25 @@ jobs: BOARD=${{ matrix.board }} \ BRANCH=current \ RELEASE=${{ env.RELEASE }} \ - BUILD_MINIMAL=no \ - BUILD_DESKTOP=yes \ + BUILD_MINIMAL=yes \ + BUILD_DESKTOP=no \ KERNEL_ONLY=no \ KERNEL_CONFIGURE=prebuilt \ COMPRESS_OUTPUTIMAGE=no \ IGNORE_UPDATES=yes \ REPOSITORY_INSTALL="u-boot,kernel" \ - DESKTOP_ENVIRONMENT_CONFIG_NAME="config_base" \ - DESKTOP_ENVIRONMENT=${{ matrix.desktop }} \ + DESKTOP_ENVIRONMENT_CONFIG_NAME="" \ + DESKTOP_ENVIRONMENT="" \ SKIP_EXTERNAL_TOOLCHAINS=yes \ - FORCED_MONTH_OFFSET=12 \ - DESKTOP_APPGROUPS_SELECTED="3dsupport browsers" \ - ROOTFSCACHE_VERSION="$(shuf -i 1-100000 -n 1)" - -# - name: Upload artefacts -# if: ${{ env.SKIP != 'yes' }} -# uses: actions/upload-artifact@v3 -# with: -# name: "${{ matrix.board }}-${{ env.RELEASE }}-${{ matrix.desktop }}" -# path: build/output/images/* -# if-no-files-found: error -# retention-days: 7 + + - name: Upload artefacts + if: ${{ env.SKIP != 'yes' }} + uses: actions/upload-artifact@v3 + with: + name: "${{ matrix.board }}-${{ env.RELEASE }}-${{ matrix.desktop }}" + path: build/output/images/* + if-no-files-found: error + retention-days: 7 - name: Runner prepare uses: armbian/actions/runner-prepare@main From d64bc9f8a7b8b6b521ecab63c9bc320d0b65c05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 11 Sep 2022 19:09:12 +0200 Subject: [PATCH 02/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 4846d388c..d18d4dee6 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -160,3 +160,45 @@ jobs: - name: Runner prepare uses: armbian/actions/runner-prepare@main + + make-list: + + needs: gradle + runs-on: [Linux] + outputs: + matrix: ${{steps.list_dirs.outputs.matrix}} + steps: + + - name: Read + run: | + + echo ${{ matrix.target }} + + - name: Download changes + uses: actions/download-artifact@v3 + with: + name: ${{ env.UPLOAD }} + path: ${{ env.UPLOAD }} + + - name: Checkout repository + uses: actions/checkout@v3 + with: + repository: armbian/build + fetch-depth: 1 + path: build + clean: false + + - name: Build desktops + id: list_dirs + run: | + MATRIX=$( + set +e + releases=($(find build/config/distributions -mindepth 1 -maxdepth 1 -type d | sed 's/.*\///' )) + for i in ${releases[@]} + do + environments=($([[ -d build/config/desktop/$i/environments ]] && ls -1 build/config/desktop/$i/environments)) + for j in ${environments[@]} + do + echo "$i:$j" + done + done) From b04da865329520cd85ac8a70a4623bbfd41580b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 11 Sep 2022 19:10:19 +0200 Subject: [PATCH 03/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index d18d4dee6..2d8122879 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -153,7 +153,7 @@ jobs: if: ${{ env.SKIP != 'yes' }} uses: actions/upload-artifact@v3 with: - name: "${{ matrix.board }}-${{ env.RELEASE }}-${{ matrix.desktop }}" + name: "${{ matrix.board }}-${{ env.RELEASE }}" path: build/output/images/* if-no-files-found: error retention-days: 7 @@ -174,12 +174,6 @@ jobs: echo ${{ matrix.target }} - - name: Download changes - uses: actions/download-artifact@v3 - with: - name: ${{ env.UPLOAD }} - path: ${{ env.UPLOAD }} - - name: Checkout repository uses: actions/checkout@v3 with: @@ -202,3 +196,5 @@ jobs: echo "$i:$j" done done) + + echo $MATRIX From 2a7d980024aa9b80418b6c8719d06bbdf2042ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 11 Sep 2022 20:19:01 +0200 Subject: [PATCH 04/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 2d8122879..310eb7a71 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -24,6 +24,8 @@ jobs: name: Make runs-on: ubuntu-latest + outputs: + release: ${{steps.gradle.outputs.release}} steps: - name: Runner prepare @@ -104,6 +106,8 @@ jobs: if: ${{ env.SKIP != 'yes' }} run: | + echo ::set-output name=release::${{ env.RELEASE }} + cd build # framework init @@ -165,14 +169,17 @@ jobs: needs: gradle runs-on: [Linux] - outputs: - matrix: ${{steps.list_dirs.outputs.matrix}} + strategy: + max-parallel: 16 + fail-fast: false + matrix: + node: ${{fromJson(needs.gradle.outputs.release)}} steps: - name: Read run: | - echo ${{ matrix.target }} + echo ${{ matrix.node }} - name: Checkout repository uses: actions/checkout@v3 From 6783c9e766b29f2f516bf6efd1cdb40c45c740ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 08:20:16 +0200 Subject: [PATCH 05/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 42 ++++++------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 310eb7a71..9a6650deb 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -166,42 +166,24 @@ jobs: uses: armbian/actions/runner-prepare@main make-list: - - needs: gradle - runs-on: [Linux] strategy: - max-parallel: 16 fail-fast: false - matrix: - node: ${{fromJson(needs.gradle.outputs.release)}} + max-parallel: 8 + matrix: + board: [uefi-x86] + target: ["debian:bullseye:10","debian:sid:12","ubuntu:focal:8","ubuntu:jammy:12"] + + runs-on: ubuntu-latest steps: - name: Read run: | - echo ${{ matrix.node }} + echo ${{ matrix.target }} + echo ${{ matrix.board }} - - name: Checkout repository - uses: actions/checkout@v3 + - name: Download artifacts + uses: actions/download-artifact@v3 with: - repository: armbian/build - fetch-depth: 1 - path: build - clean: false - - - name: Build desktops - id: list_dirs - run: | - MATRIX=$( - set +e - releases=($(find build/config/distributions -mindepth 1 -maxdepth 1 -type d | sed 's/.*\///' )) - for i in ${releases[@]} - do - environments=($([[ -d build/config/desktop/$i/environments ]] && ls -1 build/config/desktop/$i/environments)) - for j in ${environments[@]} - do - echo "$i:$j" - done - done) - - echo $MATRIX + name: "${{ matrix.board }}-${{ env.target }}" + path: "${{ matrix.board }}-${{ env.target }}" From 94b3d4dfa58e336e235e4aef77650850cecb544a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 08:31:46 +0200 Subject: [PATCH 06/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 9a6650deb..f42ca9317 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -166,6 +166,7 @@ jobs: uses: armbian/actions/runner-prepare@main make-list: + needs: gradle strategy: fail-fast: false max-parallel: 8 @@ -174,16 +175,20 @@ jobs: target: ["debian:bullseye:10","debian:sid:12","ubuntu:focal:8","ubuntu:jammy:12"] runs-on: ubuntu-latest + name: "Test" steps: - name: Read run: | + + RELEASE=$(echo ${{ matrix.target }} | cut -d":" -f2) echo ${{ matrix.target }} - echo ${{ matrix.board }} + echo ${RELEASE} + echo "RELEASE=$RELEASE" >> $GITHUB_ENV - name: Download artifacts uses: actions/download-artifact@v3 with: - name: "${{ matrix.board }}-${{ env.target }}" - path: "${{ matrix.board }}-${{ env.target }}" + name: "${{ matrix.board }}-${{ env.RELEASE }}" + path: "${{ matrix.board }}-${{ env.RELEASE }}" From 8cff07b7ce61235ab5e896cbcc151dd9f798e959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 09:12:35 +0200 Subject: [PATCH 07/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 64 ++++++++++++++++++- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index f42ca9317..90d99a2cf 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -174,13 +174,17 @@ jobs: board: [uefi-x86] target: ["debian:bullseye:10","debian:sid:12","ubuntu:focal:8","ubuntu:jammy:12"] - runs-on: ubuntu-latest + runs-on: qemu name: "Test" steps: - - name: Read + - name: Prepare run: | + sudo apt-get -y install qemu-kvm libvirt-daemon-system libvirt-clients virtinst cpu-checker libguestfs-tools libosinfo-bin dnsmasq gir1.2-spiceclientgtk-3.0 virt-viewer sshpass + + - name: Read + run: | RELEASE=$(echo ${{ matrix.target }} | cut -d":" -f2) echo ${{ matrix.target }} @@ -192,3 +196,59 @@ jobs: with: name: "${{ matrix.board }}-${{ env.RELEASE }}" path: "${{ matrix.board }}-${{ env.RELEASE }}" + + - name: Remove previous if any + run: | + + virsh destroy Armbian || true + virsh undefine Armbian || true + + - name: Convert to QEMU and resize + run: | + + sudo qemu-img convert -f raw -O qcow2 image.iso /var/lib/libvirt/images/image.qcow2 + sudo qemu-img resize /var/lib/libvirt/images/image.qcow2 +10G + + - name: Boot it up + run: | + + virt-install --name Armbian --memory 2048 --vcpus 4 --disk /var/lib/libvirt/images/image.qcow2,bus=sata --import --os-variant ubuntu22.04 --network bridge=br0 --noautoconsole + + - name: Sleep for 2m to make sure image booted up + uses: jakejarvis/wait-action@master + with: + time: '2m' + + - name: Find and login + run: | + + # get ip + MAC=$(sudo virsh domiflist Armbian | tail -2 | head -1 | awk '{print $NF}') + USER_HOST=$(sudo nmap -sP 10.0.40.0/24 | grep -i "$MAC" -B 2 | head -1 | awk '{print $NF}') + + # login credentials + USER_ROOT=root + PASS_ROOT=testpassword + USER_NORMAL=guest + PASS_NORMAL=testpassword + + expect -c " + spawn sshpass -p 1234 ssh -o "StrictHostKeyChecking=accept-new" ${USER_ROOT}@${USER_HOST} + set timeout 120 + expect \"Create root password: \" + send \"${PASS_ROOT}\r\" + expect \"Repeat root password: \" + send \"${PASS_ROOT}\r\" + expect \"zsh\" + send \"2\r\" + expect \"*to abort\" + send \"${USER_NORMAL}\r\" + expect \"Create*password:\" + send \"${PASS_NORMAL}\r\" + expect \"Repeat*password:\" + send \"${PASS_NORMAL}\r\" + expect \"Please provide your real name: \" + send \"${NAME_NORMAL}\r\" + expect \"*language based on your location*\" + send \"y\r\" + expect eof\r" From 660ff664b5f80d5b4bc51b7b041ec4b670a79b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 09:13:37 +0200 Subject: [PATCH 08/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 90d99a2cf..6e23f0eda 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -252,3 +252,5 @@ jobs: expect \"*language based on your location*\" send \"y\r\" expect eof\r" + + sshpass -p sendmail ssh -o "StrictHostKeyChecking=accept-new" ${USER_ROOT}@${USER_HOST} "apt-get -y update" From bfe61443269e7508eee4d120cc53893c45e8aeab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 09:51:47 +0200 Subject: [PATCH 09/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 6e23f0eda..d6dd376e6 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -20,7 +20,7 @@ jobs: max-parallel: 8 matrix: board: [uefi-x86] - target: ["debian:bullseye:10","debian:sid:12","ubuntu:focal:8","ubuntu:jammy:12"] + target: ["debian:bullseye:10","debian:sid:12","ubuntu:jammy:12"] name: Make runs-on: ubuntu-latest From 053b3f6274ea2435b7fff3515fb0e0e56d831103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 10:40:10 +0200 Subject: [PATCH 10/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index d6dd376e6..35795d21b 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -209,15 +209,11 @@ jobs: sudo qemu-img convert -f raw -O qcow2 image.iso /var/lib/libvirt/images/image.qcow2 sudo qemu-img resize /var/lib/libvirt/images/image.qcow2 +10G - - name: Boot it up + - name: Boot it up and wait 2 minutes run: | virt-install --name Armbian --memory 2048 --vcpus 4 --disk /var/lib/libvirt/images/image.qcow2,bus=sata --import --os-variant ubuntu22.04 --network bridge=br0 --noautoconsole - - - name: Sleep for 2m to make sure image booted up - uses: jakejarvis/wait-action@master - with: - time: '2m' + sleep 2m - name: Find and login run: | From 7f9f5e8c089a12181535d40b2ac21cbb2ae44d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 10:43:15 +0200 Subject: [PATCH 11/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 35795d21b..3a38abbae 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -20,7 +20,7 @@ jobs: max-parallel: 8 matrix: board: [uefi-x86] - target: ["debian:bullseye:10","debian:sid:12","ubuntu:jammy:12"] + target: ["debian:bullseye:10","debian:sid:12","ubuntu:focal:8","ubuntu:jammy:12"] name: Make runs-on: ubuntu-latest From d6ea973e34f01a85084cf77ecf96de3c49914cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 11:22:40 +0200 Subject: [PATCH 12/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 3a38abbae..667780fb3 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -206,7 +206,7 @@ jobs: - name: Convert to QEMU and resize run: | - sudo qemu-img convert -f raw -O qcow2 image.iso /var/lib/libvirt/images/image.qcow2 + sudo qemu-img convert -f raw -O qcow2 "${{ matrix.board }}-${{ env.RELEASE }}" /var/lib/libvirt/images/image.qcow2 sudo qemu-img resize /var/lib/libvirt/images/image.qcow2 +10G - name: Boot it up and wait 2 minutes From d07d80c0aa99dfff43b5947cb81b3bd89bb59ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 12:00:19 +0200 Subject: [PATCH 13/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 667780fb3..318b164c0 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -206,7 +206,8 @@ jobs: - name: Convert to QEMU and resize run: | - sudo qemu-img convert -f raw -O qcow2 "${{ matrix.board }}-${{ env.RELEASE }}" /var/lib/libvirt/images/image.qcow2 + IMAGE=$(ls -1 "${{ matrix.board }}-${{ env.RELEASE }}"/*.img) + sudo qemu-img convert -f raw -O qcow2 ${IMAGE} /var/lib/libvirt/images/image.qcow2 sudo qemu-img resize /var/lib/libvirt/images/image.qcow2 +10G - name: Boot it up and wait 2 minutes From 087afb436464275ce406e839aad95d82b219551b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 12:21:04 +0200 Subject: [PATCH 14/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 318b164c0..61000346e 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -213,7 +213,7 @@ jobs: - name: Boot it up and wait 2 minutes run: | - virt-install --name Armbian --memory 2048 --vcpus 4 --disk /var/lib/libvirt/images/image.qcow2,bus=sata --import --os-variant ubuntu22.04 --network bridge=br0 --noautoconsole + sudo virt-install --name Armbian --memory 2048 --vcpus 4 --disk /var/lib/libvirt/images/image.qcow2,bus=sata --import --os-variant ubuntu22.04 --network bridge=br0 --noautoconsole sleep 2m - name: Find and login From e1f814c53d3a72fe325b3f6054fa0312d4391862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 12:22:26 +0200 Subject: [PATCH 15/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 61000346e..8279c0e42 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -190,6 +190,9 @@ jobs: echo ${{ matrix.target }} echo ${RELEASE} echo "RELEASE=$RELEASE" >> $GITHUB_ENV + + # remove old + rm -rf "${{ matrix.board }}-${{ env.RELEASE }}" - name: Download artifacts uses: actions/download-artifact@v3 From 7cce8e1ec26498f12fcdbfb7abeb0ff58e879fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 12:49:54 +0200 Subject: [PATCH 16/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 8279c0e42..4ddc0d16f 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -203,8 +203,8 @@ jobs: - name: Remove previous if any run: | - virsh destroy Armbian || true - virsh undefine Armbian || true + sudo virsh destroy Armbian || true + sudo virsh undefine Armbian || true - name: Convert to QEMU and resize run: | @@ -252,5 +252,6 @@ jobs: expect \"*language based on your location*\" send \"y\r\" expect eof\r" - - sshpass -p sendmail ssh -o "StrictHostKeyChecking=accept-new" ${USER_ROOT}@${USER_HOST} "apt-get -y update" + + sshpass -p ${PASS_ROOT} ssh -o "StrictHostKeyChecking=accept-new" ${USER_ROOT}@${USER_HOST} "bash /etc/update-motd.d/10-armbian-header" + sshpass -p ${PASS_ROOT} ssh -o "StrictHostKeyChecking=accept-new" ${USER_ROOT}@${USER_HOST} "apt-get -y update" From 90a0f7d742d362778fcaf019d5e2b77e96bf95ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 13:09:31 +0200 Subject: [PATCH 17/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 4ddc0d16f..dbc43b34c 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -213,11 +213,11 @@ jobs: sudo qemu-img convert -f raw -O qcow2 ${IMAGE} /var/lib/libvirt/images/image.qcow2 sudo qemu-img resize /var/lib/libvirt/images/image.qcow2 +10G - - name: Boot it up and wait 2 minutes + - name: Boot it up and wait 1 minute run: | sudo virt-install --name Armbian --memory 2048 --vcpus 4 --disk /var/lib/libvirt/images/image.qcow2,bus=sata --import --os-variant ubuntu22.04 --network bridge=br0 --noautoconsole - sleep 2m + sleep 1m - name: Find and login run: | From cb610c7cb131043f232877a86f461d6413ec0bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 13:21:34 +0200 Subject: [PATCH 18/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index dbc43b34c..0449bdb22 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -222,6 +222,8 @@ jobs: - name: Find and login run: | + export TERM=xterm + # get ip MAC=$(sudo virsh domiflist Armbian | tail -2 | head -1 | awk '{print $NF}') USER_HOST=$(sudo nmap -sP 10.0.40.0/24 | grep -i "$MAC" -B 2 | head -1 | awk '{print $NF}') From c2a8978f7f1b0ac1755437a726d8451e45090eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 13:33:35 +0200 Subject: [PATCH 19/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 0449bdb22..5ac5ef5cf 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -253,7 +253,9 @@ jobs: send \"${NAME_NORMAL}\r\" expect \"*language based on your location*\" send \"y\r\" - expect eof\r" + expect \"*#\" + send \"exit\r\" + " sshpass -p ${PASS_ROOT} ssh -o "StrictHostKeyChecking=accept-new" ${USER_ROOT}@${USER_HOST} "bash /etc/update-motd.d/10-armbian-header" sshpass -p ${PASS_ROOT} ssh -o "StrictHostKeyChecking=accept-new" ${USER_ROOT}@${USER_HOST} "apt-get -y update" From 0eb43b96c6429c9875a099bbce96a3767474409d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 13:34:17 +0200 Subject: [PATCH 20/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 5ac5ef5cf..47f483c99 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -142,7 +142,7 @@ jobs: BOARD=${{ matrix.board }} \ BRANCH=current \ RELEASE=${{ env.RELEASE }} \ - BUILD_MINIMAL=yes \ + BUILD_MINIMAL=no \ BUILD_DESKTOP=no \ KERNEL_ONLY=no \ KERNEL_CONFIGURE=prebuilt \ From 2fce3a0dde1003802a929b53a6391e829de65617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 14:09:47 +0200 Subject: [PATCH 21/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 47f483c99..e94919dd7 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -192,6 +192,7 @@ jobs: echo "RELEASE=$RELEASE" >> $GITHUB_ENV # remove old + ls -l "${{ matrix.board }}-${{ env.RELEASE }}" rm -rf "${{ matrix.board }}-${{ env.RELEASE }}" - name: Download artifacts From 7caee867c9386e3055e6c6cb2e06ddcab312270b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 15:15:37 +0200 Subject: [PATCH 22/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index e94919dd7..4e8085395 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -192,8 +192,8 @@ jobs: echo "RELEASE=$RELEASE" >> $GITHUB_ENV # remove old - ls -l "${{ matrix.board }}-${{ env.RELEASE }}" - rm -rf "${{ matrix.board }}-${{ env.RELEASE }}" + ls -l "${{ matrix.board }}-${RELEASE}" + rm -rf "${{ matrix.board }}-${RELEASE}" - name: Download artifacts uses: actions/download-artifact@v3 From 0ded8edbefbc647e48b12042ce82dc88aa2bd106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 15:34:45 +0200 Subject: [PATCH 23/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index 4e8085395..c81b652f6 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -192,7 +192,6 @@ jobs: echo "RELEASE=$RELEASE" >> $GITHUB_ENV # remove old - ls -l "${{ matrix.board }}-${RELEASE}" rm -rf "${{ matrix.board }}-${RELEASE}" - name: Download artifacts From 9fd443cc455224342e07113ce44fe46722dbb1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 12 Sep 2022 15:40:24 +0200 Subject: [PATCH 24/39] Update build-test-image-docker.yml --- .github/workflows/build-test-image-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-image-docker.yml b/.github/workflows/build-test-image-docker.yml index c81b652f6..41af1f049 100644 --- a/.github/workflows/build-test-image-docker.yml +++ b/.github/workflows/build-test-image-docker.yml @@ -222,7 +222,7 @@ jobs: - name: Find and login run: | - export TERM=xterm + export TERM=linux # get ip MAC=$(sudo virsh domiflist Armbian | tail -2 | head -1 | awk '{print $NF}') From 57060178d3926791ac1ab54e26d5f0e3c27cade0 Mon Sep 17 00:00:00 2001 From: Armbianworker Date: Mon, 3 Jul 2023 15:44:52 +0000 Subject: [PATCH 25/39] Update runners status --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 93dd8a264..5e8d8b0e5 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,12 @@ |--|--:|--:| |Cats|12|15 Gb| |GitHub|40|136 Gb| -|Igor|680|610 Gb| -|JetHub|32|39 Gb| -|Lane|96|93 Gb| -|Xogium|14|7 Gb| +|Hristov|16|15 Gb| +|Igor|232|433 Gb| +|JetHub|12|64 Gb| +|Lane|32|31 Gb| +|Werner|16|62 Gb| +|Xogium|12|7 Gb| ## Donating Virtual Machine to Armbian? Our CI engine is hungry for CPU and memory resources. In case you have spare resources and you would like to donate it to Armbian, you can do it this way: From dacb613ab160620cfc59665bcee0d8ddf32fb950 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 17:51:01 +0200 Subject: [PATCH 26/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index bb7b74b47..fb9a338bc 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -22,7 +22,7 @@ jobs: Prepare: name: "Power system on" outputs: - matrix: ${{steps.list_dirs.outputs.matrix}} + matrix: ${{steps.json.outputs.JSON_CONTENT}} runs-on: [self-hosted, Linux, local] steps: @@ -30,6 +30,7 @@ jobs: uses: armbian/actions/runner-prepare@main - name: Power on + if: ${{ true.test }} uses: armbian/actions/power-on@main with: KEY_POWER_ON: ${{ secrets.KEY_POWER_ON }} @@ -38,14 +39,21 @@ jobs: KNOWN_HOSTS_REPOSITORY: ${{ secrets.KNOWN_HOSTS_REPOSITORY }} - name: Determine changed kernels - id: list_dirs + id: json run: | - echo ::set-output name=matrix::$( - curl -H "Authorization: Token ${{ secrets.NETBOX_TOKEN }}" -H "Accept: application/json; indent=4" \ - "https://stuff.armbian.com/netbox/api/dcim/devices/?limit=500&name__empty=false&tenant=igor&status=active&device_role=DUT&tag=qa" \ - | jq '.results[] | .display, .primary_ip.address' | xargs -n2 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ - | sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq) + echo 'JSON_CONTENT<> $GITHUB_OUTPUT + echo '[ + "FriendlyElec Zero Pi:10.0.30.195", + "FriendlyElec Nanopi Neo 2 black:10.0.30.184" + ]' + echo 'EOF' >> $GITHUB_OUTPUT + + #echo ::set-output name=matrix::$( + #curl -H "Authorization: Token ${{ secrets.NETBOX_TOKEN }}" -H "Accept: application/json; indent=4" \ + #"https://stuff.armbian.com/netbox/api/dcim/devices/?limit=500&name__empty=false&tenant=igor&status=active&device_role=DUT&tag=qa" \ + #| jq '.results[] | .display, .primary_ip.address' | xargs -n2 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ + #| sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq) Test: name: "DUT" @@ -57,7 +65,7 @@ jobs: #max-parallel: 16 fail-fast: false matrix: - + node: ${{fromJson(needs.Prepare.outputs.matrix)}} steps: @@ -193,7 +201,8 @@ jobs: Stop: name: "Power system off" - if: always() + #if: always() + if: ${{ true.test }} needs: Test runs-on: [self-hosted, Linux, local] steps: From 8ad80a263c77b3bcdcdbc2727b046e167c2837fd Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 17:52:23 +0200 Subject: [PATCH 27/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index fb9a338bc..8e0f5f95c 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -30,7 +30,7 @@ jobs: uses: armbian/actions/runner-prepare@main - name: Power on - if: ${{ true.test }} + if: ! always() uses: armbian/actions/power-on@main with: KEY_POWER_ON: ${{ secrets.KEY_POWER_ON }} @@ -201,8 +201,7 @@ jobs: Stop: name: "Power system off" - #if: always() - if: ${{ true.test }} + if: ! always() needs: Test runs-on: [self-hosted, Linux, local] steps: From 98cfd07e9f76df97a9d730234b0560b160f1f653 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 17:54:25 +0200 Subject: [PATCH 28/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 8e0f5f95c..d0452f472 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -30,7 +30,7 @@ jobs: uses: armbian/actions/runner-prepare@main - name: Power on - if: ! always() + if: ${{ !failure() && !cancelled() }} uses: armbian/actions/power-on@main with: KEY_POWER_ON: ${{ secrets.KEY_POWER_ON }} @@ -201,7 +201,7 @@ jobs: Stop: name: "Power system off" - if: ! always() + if: ${{ !failure() && !cancelled() }} needs: Test runs-on: [self-hosted, Linux, local] steps: From fed5419ab14d4d5589c340e01208fca3661e3b37 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 17:56:30 +0200 Subject: [PATCH 29/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 40 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index d0452f472..3ef72008e 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -26,17 +26,16 @@ jobs: runs-on: [self-hosted, Linux, local] steps: - - name: Runner prepare - uses: armbian/actions/runner-prepare@main + #- name: Runner prepare + # uses: armbian/actions/runner-prepare@main - - name: Power on - if: ${{ !failure() && !cancelled() }} - uses: armbian/actions/power-on@main - with: - KEY_POWER_ON: ${{ secrets.KEY_POWER_ON }} - USER_REPOSITORY: ${{ secrets.USER_REPOSITORY }} - HOST_REPOSITORY: ${{ secrets.HOST_REPOSITORY }} - KNOWN_HOSTS_REPOSITORY: ${{ secrets.KNOWN_HOSTS_REPOSITORY }} + #- name: Power on + # uses: armbian/actions/power-on@main + # with: + # KEY_POWER_ON: ${{ secrets.KEY_POWER_ON }} + # USER_REPOSITORY: ${{ secrets.USER_REPOSITORY }} + # HOST_REPOSITORY: ${{ secrets.HOST_REPOSITORY }} + # KNOWN_HOSTS_REPOSITORY: ${{ secrets.KNOWN_HOSTS_REPOSITORY }} - name: Determine changed kernels id: json @@ -201,13 +200,12 @@ jobs: Stop: name: "Power system off" - if: ${{ !failure() && !cancelled() }} needs: Test runs-on: [self-hosted, Linux, local] steps: - - name: Runner prepare - uses: armbian/actions/runner-prepare@main + #- name: Runner prepare + # uses: armbian/actions/runner-prepare@main - name: Clean run: | @@ -235,12 +233,12 @@ jobs: name: status path: status - - name: Power off - if: always() - uses: armbian/actions/power-off@main - with: + #- name: Power off + # if: always() + # uses: armbian/actions/power-off@main + # with: - KEY_POWER_OFF: ${{ secrets.KEY_POWER_OFF }} - USER_REPOSITORY: ${{ secrets.USER_REPOSITORY }} - HOST_REPOSITORY: ${{ secrets.HOST_REPOSITORY }} - KNOWN_HOSTS_REPOSITORY: ${{ secrets.KNOWN_HOSTS_REPOSITORY }} + # KEY_POWER_OFF: ${{ secrets.KEY_POWER_OFF }} + # USER_REPOSITORY: ${{ secrets.USER_REPOSITORY }} + # HOST_REPOSITORY: ${{ secrets.HOST_REPOSITORY }} + # KNOWN_HOSTS_REPOSITORY: ${{ secrets.KNOWN_HOSTS_REPOSITORY }} From 93abbc7212d83d52d042dffe5f10f33fb40199b8 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 17:57:13 +0200 Subject: [PATCH 30/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 3ef72008e..890ba64dd 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -58,7 +58,7 @@ jobs: name: "DUT" runs-on: igor needs: Prepare - if: ${{ needs.Prepare.outputs.matrix != '[]' && needs.Prepare.outputs.matrix != '' }} + #if: ${{ needs.Prepare.outputs.matrix != '[]' && needs.Prepare.outputs.matrix != '' }} timeout-minutes: 15 strategy: #max-parallel: 16 From cd7dd179fe7e84a44cfc36437a1142ad006d375b Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 17:58:08 +0200 Subject: [PATCH 31/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 890ba64dd..d0331aa6c 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -45,7 +45,7 @@ jobs: echo '[ "FriendlyElec Zero Pi:10.0.30.195", "FriendlyElec Nanopi Neo 2 black:10.0.30.184" - ]' + ]' >> $GITHUB_OUTPUT echo 'EOF' >> $GITHUB_OUTPUT #echo ::set-output name=matrix::$( From a3d4a6b6b96b60afa14efd3dbc9607e87d9e5c55 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 18:20:07 +0200 Subject: [PATCH 32/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index d0331aa6c..8686b0e93 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -51,7 +51,7 @@ jobs: #echo ::set-output name=matrix::$( #curl -H "Authorization: Token ${{ secrets.NETBOX_TOKEN }}" -H "Accept: application/json; indent=4" \ #"https://stuff.armbian.com/netbox/api/dcim/devices/?limit=500&name__empty=false&tenant=igor&status=active&device_role=DUT&tag=qa" \ - #| jq '.results[] | .display, .primary_ip.address' | xargs -n2 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ + #| jq '.results[] | .display, .device_type.slug, .primary_ip.address' | xargs -n3 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ #| sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq) Test: From 21e595d606b1806a284116dfe410d88e1179dc5f Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 18:32:22 +0200 Subject: [PATCH 33/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 8686b0e93..c4171b121 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -42,17 +42,17 @@ jobs: run: | echo 'JSON_CONTENT<> $GITHUB_OUTPUT - echo '[ - "FriendlyElec Zero Pi:10.0.30.195", - "FriendlyElec Nanopi Neo 2 black:10.0.30.184" - ]' >> $GITHUB_OUTPUT + #echo '[ + # "FriendlyElec Zero Pi:10.0.30.195", + # "FriendlyElec Nanopi Neo 2 black:10.0.30.184" + # ]' >> $GITHUB_OUTPUT + # + curl -H "Authorization: Token ${{ secrets.NETBOX_TOKEN }}" -H "Accept: application/json; indent=4" \ + "https://stuff.armbian.com/netbox/api/dcim/devices/?limit=500&name__empty=false&tenant=igor&status=active&device_role=DUT&tag=qa" \ + | jq '.results[] | .display, .device_type.slug, .primary_ip.address' | head -1 \ + | xargs -n3 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ + | sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq echo 'EOF' >> $GITHUB_OUTPUT - - #echo ::set-output name=matrix::$( - #curl -H "Authorization: Token ${{ secrets.NETBOX_TOKEN }}" -H "Accept: application/json; indent=4" \ - #"https://stuff.armbian.com/netbox/api/dcim/devices/?limit=500&name__empty=false&tenant=igor&status=active&device_role=DUT&tag=qa" \ - #| jq '.results[] | .display, .device_type.slug, .primary_ip.address' | xargs -n3 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ - #| sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq) Test: name: "DUT" From 68b9b7cf4e004404501b0c8e752c9c8e9c42b738 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 18:33:18 +0200 Subject: [PATCH 34/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index c4171b121..8a6bd3063 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -51,7 +51,7 @@ jobs: "https://stuff.armbian.com/netbox/api/dcim/devices/?limit=500&name__empty=false&tenant=igor&status=active&device_role=DUT&tag=qa" \ | jq '.results[] | .display, .device_type.slug, .primary_ip.address' | head -1 \ | xargs -n3 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ - | sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq + | sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq >> $GITHUB_OUTPUT echo 'EOF' >> $GITHUB_OUTPUT Test: From 0d9523e280b6962765671c224e88b8472f2d92af Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 18:33:52 +0200 Subject: [PATCH 35/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 8a6bd3063..ddb3a89fe 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -49,7 +49,7 @@ jobs: # curl -H "Authorization: Token ${{ secrets.NETBOX_TOKEN }}" -H "Accept: application/json; indent=4" \ "https://stuff.armbian.com/netbox/api/dcim/devices/?limit=500&name__empty=false&tenant=igor&status=active&device_role=DUT&tag=qa" \ - | jq '.results[] | .display, .device_type.slug, .primary_ip.address' | head -1 \ + | jq '.results[] | .display, .device_type.slug, .primary_ip.address' | head -3 \ | xargs -n3 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ | sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq >> $GITHUB_OUTPUT echo 'EOF' >> $GITHUB_OUTPUT From cb56d42b526c97ed0d56b91573513cf90ea9e392 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 19:47:39 +0200 Subject: [PATCH 36/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index ddb3a89fe..020d4ff03 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -49,8 +49,8 @@ jobs: # curl -H "Authorization: Token ${{ secrets.NETBOX_TOKEN }}" -H "Accept: application/json; indent=4" \ "https://stuff.armbian.com/netbox/api/dcim/devices/?limit=500&name__empty=false&tenant=igor&status=active&device_role=DUT&tag=qa" \ - | jq '.results[] | .display, .device_type.slug, .primary_ip.address' | head -3 \ - | xargs -n3 -d'\n' | grep -v null | sed -e 's/ ([^()]*)//g' \ + | jq '.results[] | .display, .device_type.slug, .primary_ip.address' \ + | xargs -n3 -d'\n' | head -3 | grep -v null | sed -e 's/ ([^()]*)//g' \ | sed 's/\/24"/"/g' | sed "s/\" \"/:/g" | sed "s/\"//g" |jq -cnR '[inputs | select(length>0)]' | jq >> $GITHUB_OUTPUT echo 'EOF' >> $GITHUB_OUTPUT From ac02f7e3a631bf909b3a919bbb154dfb57df08db Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 20:03:46 +0200 Subject: [PATCH 37/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 020d4ff03..dc205f4d9 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -84,7 +84,8 @@ jobs: CHUNK="${{ matrix.node }}" echo "DUT_NAME=$(echo $CHUNK | cut -d":" -f1)" >> $GITHUB_ENV - echo "DUT_IP=$(echo $CHUNK | cut -d":" -f2)" >> $GITHUB_ENV + echo "DUT_SLUG=$(echo $CHUNK | cut -d":" -f2)" >> $GITHUB_ENV + echo "DUT_IP=$(echo $CHUNK | cut -d":" -f3)" >> $GITHUB_ENV - name: Is online? run: | From ccee0afd5b204c3003eba98fe24a1456ebe78d2c Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 3 Jul 2023 20:08:43 +0200 Subject: [PATCH 38/39] Update smoke-tests.yml --- .github/workflows/smoke-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index dc205f4d9..2545c07f4 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -79,7 +79,7 @@ jobs: known_hosts: github.com ssh-rsa AAAAB3Nz if_key_exists: replace - - name: Read values + - name: "Read values" run: | CHUNK="${{ matrix.node }}" @@ -87,7 +87,7 @@ jobs: echo "DUT_SLUG=$(echo $CHUNK | cut -d":" -f2)" >> $GITHUB_ENV echo "DUT_IP=$(echo $CHUNK | cut -d":" -f3)" >> $GITHUB_ENV - - name: Is online? + - name: "Is ${{ env.DUT_IP }} online?" run: | # set this here From 833d2b3a20b505aea66d398787971f673a0bee89 Mon Sep 17 00:00:00 2001 From: Igor Date: Sun, 10 Sep 2023 13:08:35 +0200 Subject: [PATCH 39/39] Update status.yml --- .github/workflows/status.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index 0beaf9b7f..9d14d28ac 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -1,7 +1,7 @@ name: Get values on: workflow_dispatch: - push: + # push: schedule: - cron: "*/30 * * * *"