Skip to content

Commit 50dbeca

Browse files
authored
Merge pull request #630 from mhashizume/MODULES-11368/main/ubuntu-gha
(MODULES-11368) Update Ubuntu GitHub Action runner
2 parents 1f5367e + 6a5bcdc commit 50dbeca

File tree

6 files changed

+20
-9
lines changed

6 files changed

+20
-9
lines changed

.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
1111
strategy:
1212
matrix:
13-
os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2022' ]
13+
os: [ 'ubuntu-20.04', 'macos-latest', 'windows-2022' ]
1414
puppet_version: [ 6, 7 ]
1515
include:
1616
- puppet_version: 6
1717
ruby: 2.5
1818
- puppet_version: 7
1919
ruby: 2.7
2020

21-
- os: 'ubuntu-18.04'
21+
- os: 'ubuntu-20.04'
2222
os_type: 'Linux'
2323
env_set_cmd: 'export '
2424
gem_file: 'puppet-latest.gem'

.github/workflows/static_code_analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
env:
1515
ruby_version: 2.6
1616

17-
runs-on: 'ubuntu-18.04'
17+
runs-on: 'ubuntu-20.04'
1818
steps:
1919
- name: Checkout current PR code
2020
uses: actions/checkout@v2

.github/workflows/task_acceptance_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
name: On ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
os: [ 'centos-7', 'ubuntu-18.04', 'rocky-8' ]
15+
os: [ 'centos-7', 'ubuntu-20.04', 'rocky-8' ]
1616

1717
env:
1818
ruby_version: 2.5
1919
GEM_BOLT: true
2020
BEAKER_debug: true
2121
BEAKER_set: docker/${{ matrix.os }}
2222

23-
runs-on: 'ubuntu-18.04'
23+
runs-on: 'ubuntu-20.04'
2424
steps:
2525
- name: Checkout current PR code
2626
uses: actions/checkout@v2

.github/workflows/unit_tests_with_nightly_puppet_gem.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
1313
strategy:
1414
matrix:
15-
os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2022' ]
15+
os: [ 'ubuntu-20.04', 'macos-latest', 'windows-2022' ]
1616
puppet_version: [ 6, 7 ]
1717
include:
1818
- puppet_version: 6
1919
ruby: 2.5
2020
- puppet_version: 7
2121
ruby: 2.7
2222

23-
- os: 'ubuntu-18.04'
23+
- os: 'ubuntu-20.04'
2424
os_type: 'Linux'
2525
env_set_cmd: 'export '
2626
gem_file: 'puppet-latest.gem'

.github/workflows/unit_tests_with_released_puppet_gem.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
1313
strategy:
1414
matrix:
15-
os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2022' ]
15+
os: [ 'ubuntu-20.04', 'macos-latest', 'windows-2022' ]
1616
puppet_version: [ 6, 7 ]
1717
include:
1818
- puppet_version: 6
1919
ruby: 2.5
2020
- puppet_version: 7
2121
ruby: 2.7
2222

23-
- os: 'ubuntu-18.04'
23+
- os: 'ubuntu-20.04'
2424
os_type: 'Linux'
2525
- os: 'macos-latest'
2626
os_type: 'macOS'
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
HOSTS:
2+
ubuntu-2004-x64:
3+
roles:
4+
- target
5+
platform: ubuntu-20.04-amd64
6+
hypervisor: docker
7+
image: ubuntu:20.04
8+
docker_preserve_image: true
9+
docker_cmd: '["/sbin/init"]'
10+
CONFIG:
11+
trace_limit: 200

0 commit comments

Comments
 (0)