Skip to content

Commit

Permalink
fix this test
Browse files Browse the repository at this point in the history
  • Loading branch information
jhongturney committed Sep 13, 2024
1 parent 5a69133 commit e0dbb4a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ jobs:
integration-4_10_4:
name: Integration Tests (Puppet 4.10.4)
runs-on: ubuntu-latest
env:
RSPEC_PUPPET_VERSION: "2.6.15"
PUPPET_VERSION: "4.10.4"
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
Expand All @@ -21,12 +24,12 @@ jobs:
else
exit 0
fi
environment:
RSPEC_PUPPET_VERSION="2.6.15"
PUPPET_VERSION="4.10.4"
integration-7_30_0:
name: Integration Tests (Puppet 7.30.0)
runs-on: ubuntu-latest
env:
RSPEC_PUPPET_VERSION: "5.0.0"
PUPPET_VERSION: "7.30.0"
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
Expand All @@ -42,6 +45,3 @@ jobs:
else
exit 0
fi
environment:
RSPEC_PUPPET_VERSION="5.0.0"
PUPPET_VERSION="7.30.0"
8 changes: 4 additions & 4 deletions script/cibuild
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ COVERAGE_UPDATER=$(grep "covered_percent" "$DIR/lib/octofacts_updater/coverage/.

# Integration tests
EXIT_INTEGRATION=0
for puppet_version in $puppet_versions; do
for rspec_puppet_version in $rspec_puppet_versions; do
# for puppet_version in $puppet_versions; do
# for rspec_puppet_version in $rspec_puppet_versions; do
# export RSPEC_PUPPET_VERSION=$rspec_puppet_version
# export PUPPET_VERSION=$puppet_version
# RSPEC_PUPPET_VERSION is stored as an env variable
Expand All @@ -56,8 +56,8 @@ for puppet_version in $puppet_versions; do
fi
bundle exec rake octofacts:spec:octofacts_integration && local_integration_rspec=$? || local_integration_rspec=$?
if [ "$local_integration_rspec" -ne 0 ]; then EXIT_INTEGRATION=$local_integration_rspec; fi
done
done
# done
# done

echo ""
echo "==> Summary Results"
Expand Down

0 comments on commit e0dbb4a

Please sign in to comment.