From e0dbb4a30bcfd4b9d03b84531152860483210b38 Mon Sep 17 00:00:00 2001 From: jhongturney Date: Fri, 13 Sep 2024 15:01:54 -0700 Subject: [PATCH] fix this test --- .github/workflows/integration-test.yml | 12 ++++++------ script/cibuild | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index c055fe1..7f09e39 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -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 @@ -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 @@ -42,6 +45,3 @@ jobs: else exit 0 fi - environment: - RSPEC_PUPPET_VERSION="5.0.0" - PUPPET_VERSION="7.30.0" diff --git a/script/cibuild b/script/cibuild index 91ef2e6..1c7b1ae 100755 --- a/script/cibuild +++ b/script/cibuild @@ -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 @@ -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"