Skip to content

Commit 260a02c

Browse files
committed
(CONT-776) - Add puppet 8 to matrix
1 parent 6eae7d4 commit 260a02c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
- ubuntu-20.04
2222
- ubuntu-latest
2323
collection:
24-
- puppet6-nightly
2524
- puppet7-nightly
25+
- puppet8-nightly
2626

2727
runs-on: ${{ matrix.platform }}
2828

@@ -90,8 +90,8 @@ jobs:
9090
provider: "provision::provision_service"
9191
image: "windows-2022"
9292
collection:
93-
- puppet6-nightly
94-
- puppet7-nightly
93+
- puppet7-nightly
94+
- puppet8-nightly
9595

9696
steps:
9797
- name: Checkout Source

.github/workflows/nightly.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
- ubuntu-20.04
2121
- ubuntu-latest
2222
collection:
23-
- puppet6-nightly
2423
- puppet7-nightly
24+
- puppet8-nightly
2525

2626
runs-on: ${{ matrix.platform }}
2727

@@ -89,8 +89,8 @@ jobs:
8989
provider: "provision::provision_service"
9090
image: "windows-2022"
9191
collection:
92-
- puppet6-nightly
93-
- puppet7-nightly
92+
- puppet7-nightly
93+
- puppet8-nightly
9494

9595
steps:
9696
- name: Checkout Source

spec/spec_helper_acceptance_local.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def fetch_puppet_version
7676
run_shell('apt-get install -y net-tools')
7777
end
7878

79-
run_shell('sudo apt-get remove runc') unless os[:family] == 'windows' || !ENV['CI']
79+
run_shell('apt-get purge -y container-tools') unless os[:family] == 'windows' || !ENV['CI']
8080

8181
run_shell('puppet module install puppetlabs-stdlib --version 4.24.0', expect_failures: true)
8282
run_shell('puppet module install puppetlabs-apt --version 4.4.1', expect_failures: true)

0 commit comments

Comments
 (0)