Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit

Permalink
Fix GitHub Actions tests
Browse files Browse the repository at this point in the history
Make the download URL for the debian packages more generic.
  • Loading branch information
tobiashuste committed Oct 4, 2022
1 parent fba94fe commit 11612f9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

lint:
name: Lint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out the codebase.
uses: actions/checkout@v3
Expand All @@ -35,7 +35,7 @@ jobs:

license_compliance:
name: Check license compliance with reuse.
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out the codebase.
uses: actions/checkout@v3
Expand All @@ -48,7 +48,7 @@ jobs:

test:
name: Run Molecule tests.
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: true
matrix:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:

release:
name: Release new version on Ansible Galaxy
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: startsWith(github.ref, 'refs/tags/v')
needs: [lint, license_compliance, test]
steps:
Expand Down
14 changes: 7 additions & 7 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ dependency:
driver:
name: podman
platforms:
- name: instance_gitlab_ci_openstack_1
- name: instancegitlabciopenstack1
image: ${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}
pre_build_image: true
override_command: false
privileged: true # Required to run Docker in Podman
systemd: true
tty: true
- name: instance_gitlab_ci_openstack_2
- name: instancegitlabciopenstack2
image: ${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}
pre_build_image: true
override_command: false
Expand All @@ -39,9 +39,9 @@ provisioner:
vars:
gitlab_runner_concurrent: 4
host_vars:
instance_gitlab_ci_openstack_1:
gitlab_runner_version: "15.3.0"
gitlab_runner_deb_file: "https://packages.gitlab.com/runner/gitlab-runner/packages/ubuntu/jammy/gitlab-runner_15.3.0_amd64.deb/download.deb"
instancegitlabciopenstack1:
gitlab_runner_version: "15.4.0"
gitlab_runner_deb_file: "https://packages.gitlab.com/runner/gitlab-runner/packages/{{ ansible_distribution | lower }}/{{ ansible_distribution_release | lower }}/gitlab-runner_{{ gitlab_runner_version }}_amd64.deb/download.deb"
gitlab_runner_install_docker: true
gitlab_runner_ssh_public_key: "test_key.pub"
gitlab_runner_ssh_private_key: "test_key"
Expand All @@ -57,8 +57,8 @@ provisioner:
tags: ["docker", "hifis"]
locked: True
limit: 10
instance_gitlab_ci_openstack_2:
gitlab_runner_version: "15.3.0"
instancegitlabciopenstack2:
gitlab_runner_version: "15.4.0"
gitlab_runner_install_docker: false
gitlab_runner_ssh_public_key: ""
gitlab_runner_ssh_private_key: ""
Expand Down

0 comments on commit 11612f9

Please sign in to comment.