From f81b2f3be3922c53fdeef0a7e181d47aa72aebdd Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Thu, 9 Jan 2025 17:02:29 -0800 Subject: [PATCH 1/2] Enable self-hosted runners --- .github/workflows/build.yml | 2 +- .github/workflows/distros.yml | 2 +- .github/workflows/on-demand_aio.yml | 2 +- .github/workflows/on-demand_noha.yml | 4 +--- .github/workflows/scheduled_aio.yml | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7ea49fa0..aa3c692ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: - distro: debian_11 base: debian image: neutron - runs-on: macos-12 + runs-on: vm-self-hosted if: >- ( github.event_name == 'pull_request_review' && github.event.review.state == 'approved' ) || github.event_name != 'pull_request_review' steps: diff --git a/.github/workflows/distros.yml b/.github/workflows/distros.yml index 6d43d0d9b..7aceda3c8 100644 --- a/.github/workflows/distros.yml +++ b/.github/workflows/distros.yml @@ -20,7 +20,7 @@ jobs: permissions: contents: write # for technote-space/create-pr-action to push code pull-requests: write # for technote-space/create-pr-action to create a PR - runs-on: macos-12 + runs-on: vm-self-hosted steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # 4.2.0 - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # 4.0.2 diff --git a/.github/workflows/on-demand_aio.yml b/.github/workflows/on-demand_aio.yml index 07cd09fbf..ba2616751 100644 --- a/.github/workflows/on-demand_aio.yml +++ b/.github/workflows/on-demand_aio.yml @@ -52,7 +52,7 @@ jobs: fail-fast: false matrix: distro: ${{ fromJson(needs.generate-json-matrix.outputs.matrix) }} - runs-on: macos-12 + runs-on: vm-self-hosted steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # 4.2.0 - uses: ./.github/actions/vagrant-setup diff --git a/.github/workflows/on-demand_noha.yml b/.github/workflows/on-demand_noha.yml index c2379a527..4f00b8405 100644 --- a/.github/workflows/on-demand_noha.yml +++ b/.github/workflows/on-demand_noha.yml @@ -24,7 +24,7 @@ permissions: read-all jobs: check-noha-ubuntu: name: Check No High Availability deployment on Ubuntu Focal Virtual Machines - runs-on: macos-12 + runs-on: vm-self-hosted if: >- ( github.event_name == 'pull_request_review' && github.event.review.state == 'approved' ) || github.event_name != 'pull_request_review' env: @@ -34,8 +34,6 @@ jobs: steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # 4.2.0 - uses: ./.github/actions/vagrant-setup - - name: Install GNU tools - run: brew install iproute2mac - name: Install Vagrant Reload plugin run: vagrant plugin install vagrant-reload - name: Deploy OpenStack Compute nodes diff --git a/.github/workflows/scheduled_aio.yml b/.github/workflows/scheduled_aio.yml index 4e807616a..a9ffba5db 100644 --- a/.github/workflows/scheduled_aio.yml +++ b/.github/workflows/scheduled_aio.yml @@ -43,7 +43,7 @@ jobs: fail-fast: false matrix: distro: ${{ fromJson(needs.generate-json-matrix.outputs.matrix) }} - runs-on: macos-12 + runs-on: vm-self-hosted steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # 4.2.0 - uses: ./.github/actions/vagrant-setup From ed18e4f8204c11e4bc48e4460a23605c9821f85e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 01:07:26 +0000 Subject: [PATCH 2/2] Bump jinja2 from 3.1.4 to 3.1.5 in /requirements/2024.1 Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.4...3.1.5) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements/2024.1/debian_11.txt | 2 +- requirements/2024.1/rocky_9.txt | 2 +- requirements/2024.1/ubuntu_22.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/2024.1/debian_11.txt b/requirements/2024.1/debian_11.txt index 94c2883c1..44e2b24d1 100644 --- a/requirements/2024.1/debian_11.txt +++ b/requirements/2024.1/debian_11.txt @@ -32,7 +32,7 @@ importlib-resources==5.0.7 # via ansible-core iso8601==2.1.0 # via oslo-utils -jinja2==3.1.4 +jinja2==3.1.5 # via # ansible-core # kolla-ansible diff --git a/requirements/2024.1/rocky_9.txt b/requirements/2024.1/rocky_9.txt index d367bbb50..7c18bb969 100644 --- a/requirements/2024.1/rocky_9.txt +++ b/requirements/2024.1/rocky_9.txt @@ -32,7 +32,7 @@ importlib-resources==5.0.7 # via ansible-core iso8601==2.1.0 # via oslo-utils -jinja2==3.1.4 +jinja2==3.1.5 # via # ansible-core # kolla-ansible diff --git a/requirements/2024.1/ubuntu_22.txt b/requirements/2024.1/ubuntu_22.txt index fc07b6b65..6b39a1c72 100644 --- a/requirements/2024.1/ubuntu_22.txt +++ b/requirements/2024.1/ubuntu_22.txt @@ -30,7 +30,7 @@ idna==3.10 # via requests iso8601==2.1.0 # via oslo-utils -jinja2==3.1.4 +jinja2==3.1.5 # via # ansible-core # kolla-ansible