diff --git a/.github/nix_config/ci-runner/configuration.nix b/.github/nix_config/ci-runner/configuration.nix index 5b52400..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"; @@ -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 1f51d16..ac23044 100644 --- a/.github/workflows/runner_recreate.yml +++ b/.github/workflows/runner_recreate.yml @@ -17,14 +17,15 @@ ## along with this godon. If not, see . ## +# on: pull_request: types: [ labeled ] env: - RUNNER_BASE_IMAGE: "Fedora 30" + RUNNER_BASE_IMAGE: "Debian 12" 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" @@ -37,8 +38,10 @@ env: jobs: ci_runner_recreate: - if: ${{ github.event.label.name == 'ci_runner' && github.event.label.name == 'recreate' }} - runs-on: ubuntu-18.04 + 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 with: @@ -77,16 +80,16 @@ 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 --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-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"