Skip to content

Commit d2c6dc4

Browse files
authored
Merge pull request #682 from puppetlabs/maint-add_puppet8_integration
(maint) - Update integration testing
2 parents 117968e + d5ac906 commit d2c6dc4

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.github/workflows/integration_test.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: "Integration Testing"
22

3-
on: [pull_request]
3+
on:
4+
pull_request:
5+
branches:
6+
- "main"
7+
workflow_call:
8+
workflow_dispatch:
49

510
jobs:
611
setup_matrix:
@@ -32,7 +37,7 @@ jobs:
3237
id: get-matrix
3338
run: |
3439
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
35-
echo "matrix={'platform':['centos-7'],'collection':['puppet6-nightly']}" >> $GITHUB_OUTPUT
40+
echo "matrix={'platform':['centos-7'],'collection':['puppet7-nightly', 'puppet8-nightly']}" >> $GITHUB_OUTPUT
3641
else
3742
echo "matrix={}" >> $GITHUB_OUTPUT
3843
fi
@@ -47,6 +52,10 @@ jobs:
4752
fail-fast: false
4853
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
4954

55+
env:
56+
PUPPET_GEM_VERSION: '~> 7.24'
57+
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' # why is this set?
58+
5059
steps:
5160

5261
- name: Checkout Source

.github/workflows/nightly.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,9 @@ jobs:
1818
with:
1919
runs_on: "ubuntu-20.04"
2020
secrets: "inherit"
21+
22+
Integration:
23+
needs: Acceptance
24+
uses: "./.github/workflows/integration_test.yml"
25+
with:
26+
runs_on: "ubuntu-20.04"

0 commit comments

Comments
 (0)