From 83492293be63f51ca955d68d42aa92029f8ad375 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 18:48:24 +0100 Subject: [PATCH 01/11] retrigger action --- .github/workflows/runner_recreate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index 1f51d16..7ef3c16 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -17,6 +17,7 @@ ## along with this godon. If not, see . ## +# on: pull_request: types: [ labeled ] From af188bd05f176aab55be92d595bf05a967395cdc Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 19:03:51 +0100 Subject: [PATCH 02/11] ci_runner use more recent runner image --- .github/workflows/runner_recreate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index 7ef3c16..d0f0970 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -39,7 +39,7 @@ env: jobs: ci_runner_recreate: if: ${{ github.event.label.name == 'ci_runner' && github.event.label.name == 'recreate' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 with: From cfeb587ad07cc55509323b61719c738ea6adf2e6 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 19:07:37 +0100 Subject: [PATCH 03/11] ci runner recreate - change label event type --- .github/workflows/runner_recreate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index d0f0970..7868f64 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -38,7 +38,7 @@ env: jobs: ci_runner_recreate: - if: ${{ github.event.label.name == 'ci_runner' && github.event.label.name == 'recreate' }} + if: ${{ github.pull_request.label.name == 'ci_runner' && github.pull_request.label.name == 'recreate' }} runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 From 76a4fef447074d662e17579228dc785a47c5660e Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 19:11:31 +0100 Subject: [PATCH 04/11] ci runner: change conditional Use contains. --- .github/workflows/runner_recreate.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index 7868f64..1ce91a9 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -38,7 +38,9 @@ env: jobs: ci_runner_recreate: - if: ${{ github.pull_request.label.name == 'ci_runner' && github.pull_request.label.name == 'recreate' }} + if: | + contains(github.event.pull_request.labels.*.name, 'ci_runner') && + contains(github.event.pull_request.labels.*.name, 'recreate') runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 From a1692664d7731d680dccdf889edf74a2417662f5 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 19:31:09 +0100 Subject: [PATCH 05/11] ci runner recreate - update openstack auth url --- .github/workflows/runner_recreate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index 1ce91a9..f0febbf 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -25,7 +25,7 @@ on: env: RUNNER_BASE_IMAGE: "Fedora 30" INSTANCE_NAME: "ci_runner" - OS_AUTH_URL: https://oprod-controller1.osuosl.org:5000/v3 + OS_AUTH_URL: "https://openstack.osuosl.org:5000/v3" OS_PROJECT_NAME: "godon" OS_USER_DOMAIN_NAME: "Default" OS_PROJECT_DOMAIN_ID: "default" From 3232626d9dbfca5ab2573d1c3f465ee5a7fb3db1 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 19:33:14 +0100 Subject: [PATCH 06/11] update ci runner spawning image version --- .github/workflows/runner_recreate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index f0febbf..5f6aa34 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -23,7 +23,7 @@ on: types: [ labeled ] env: - RUNNER_BASE_IMAGE: "Fedora 30" + RUNNER_BASE_IMAGE: "Fedora 40" INSTANCE_NAME: "ci_runner" OS_AUTH_URL: "https://openstack.osuosl.org:5000/v3" OS_PROJECT_NAME: "godon" From a4a2908f11a0ad785cd00cd83eda4d845c140e87 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 19:44:53 +0100 Subject: [PATCH 07/11] ci runner - update spawning nixos channel --- .github/nix_config/ci-runner/configuration.nix | 2 +- .github/workflows/runner_recreate.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/nix_config/ci-runner/configuration.nix b/.github/nix_config/ci-runner/configuration.nix index 5b52400..c8eebca 100755 --- a/.github/nix_config/ci-runner/configuration.nix +++ b/.github/nix_config/ci-runner/configuration.nix @@ -156,5 +156,5 @@ nixpkgs.config.allowUnfree = true; - system.nixos.version = "23.05"; + system.nixos.version = "24.05"; } diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index 5f6aa34..23847f9 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -89,7 +89,7 @@ jobs: --become -T 120 -m raw -a "hostnamectl set-hostname ci_runner; - curl ${NIXOS_INFECT_SCRIPT_URL} | NO_REBOOT=true NO_SWAP=true NIX_CHANNEL=nixos-21.11 bash -x;" + curl ${NIXOS_INFECT_SCRIPT_URL} | NO_REBOOT=true NO_SWAP=true NIX_CHANNEL=nixos-24.05 bash -x;" ssh-keygen -R "$(cat ./instance_address)"; env: NIXOS_INFECT_SCRIPT_URL: "https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect" From c8fe966734248913fdb65edb99563b47b1a9d591 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 20:20:39 +0100 Subject: [PATCH 08/11] downgrade spawning fedora version Issue with nixos infect script. --- .github/workflows/runner_recreate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index 23847f9..705fc7a 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -23,7 +23,7 @@ on: types: [ labeled ] env: - RUNNER_BASE_IMAGE: "Fedora 40" + RUNNER_BASE_IMAGE: "Fedora 36" INSTANCE_NAME: "ci_runner" OS_AUTH_URL: "https://openstack.osuosl.org:5000/v3" OS_PROJECT_NAME: "godon" From 7ab606fb55f6490ff48624e356b89641dfd8ad96 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 20:28:48 +0100 Subject: [PATCH 09/11] give spawning ci runner more time --- .github/workflows/runner_recreate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index 705fc7a..2f1fb8f 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -80,7 +80,7 @@ jobs: awk -F= '{ print $2 }' > ./instance_address - name: infect with nixos run: > - sleep 60; + sleep 120; ansible "$(cat ./instance_address)" -i "$(cat ./instance_address)," --private-key ./access_key_file From 443718a5a70342fad0401b34bcdfb6478700a4e1 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 20:43:26 +0100 Subject: [PATCH 10/11] change base image to debian --- .github/workflows/runner_recreate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/runner_recreate.yml b/.github/workflows/runner_recreate.yml index 2f1fb8f..ac23044 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -23,7 +23,7 @@ on: types: [ labeled ] env: - RUNNER_BASE_IMAGE: "Fedora 36" + RUNNER_BASE_IMAGE: "Debian 12" INSTANCE_NAME: "ci_runner" OS_AUTH_URL: "https://openstack.osuosl.org:5000/v3" OS_PROJECT_NAME: "godon" @@ -85,8 +85,8 @@ jobs: -i "$(cat ./instance_address)," --private-key ./access_key_file --ssh-extra-args="-o StrictHostKeyChecking=accept-new" - -u fedora --become + -u debian -T 120 -m raw -a "hostnamectl set-hostname ci_runner; curl ${NIXOS_INFECT_SCRIPT_URL} | NO_REBOOT=true NO_SWAP=true NIX_CHANNEL=nixos-24.05 bash -x;" From 69f231cd5081ee4c8476ace811af76ec66b9c40b Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 14 Nov 2024 21:19:04 +0100 Subject: [PATCH 11/11] ci runner - upgrade nixos to 24.05 --- .github/nix_config/ci-runner/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/nix_config/ci-runner/configuration.nix b/.github/nix_config/ci-runner/configuration.nix index c8eebca..bd5a4ea 100755 --- a/.github/nix_config/ci-runner/configuration.nix +++ b/.github/nix_config/ci-runner/configuration.nix @@ -29,7 +29,7 @@ services = { openssh.enable = true; - github-runner = { + github-runners.gh-runner = { enable = true; url = "https://github.com/cherusk/godon"; tokenFile = "/srv/gh_runner.token";