-
-
Notifications
You must be signed in to change notification settings - Fork 242
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
use default modulesync tremplate for ci.yml
The custom squid setup is actually not needed. The removed test even works without that workaround. Since no other acceptance test actually test the install with a custom proxy I removed the test entirely. fixes #829
- Loading branch information
Showing
5 changed files
with
17 additions
and
134 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,91 +1,22 @@ | ||
--- | ||
name: CI | ||
# Managed by modulesync - DO NOT EDIT | ||
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ | ||
|
||
on: pull_request | ||
name: CI | ||
|
||
concurrency: | ||
group: ${{ github.ref_name }} | ||
cancel-in-progress: true | ||
# yamllint disable-line rule:truthy | ||
on: | ||
pull_request: {} | ||
push: | ||
branches: | ||
- main | ||
- master | ||
|
||
jobs: | ||
setup_matrix: | ||
name: 'Setup Test Matrix' | ||
runs-on: ubuntu-latest | ||
timeout-minutes: 40 | ||
outputs: | ||
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }} | ||
puppet_beaker_test_matrix: ${{ steps.get-outputs.outputs.puppet_beaker_test_matrix }} | ||
env: | ||
BUNDLE_WITHOUT: development:system_tests:release | ||
PUPPET_GEM_VERSION: ">= 7.0" | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Setup ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
ruby-version: '3.3' | ||
bundler-cache: true | ||
- name: Run static validations | ||
run: bundle exec rake validate lint check | ||
- name: Run rake rubocop | ||
run: bundle exec rake rubocop | ||
- name: Setup Test Matrix | ||
id: get-outputs | ||
run: bundle exec metadata2gha --pidfile-workaround false --domain example.com | ||
concurrency: | ||
group: ${{ github.ref_name }} | ||
cancel-in-progress: true | ||
|
||
unit: | ||
needs: setup_matrix | ||
runs-on: ubuntu-latest | ||
timeout-minutes: 40 | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}} | ||
env: | ||
BUNDLE_WITHOUT: development:system_tests:release | ||
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0" | ||
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }}) | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Setup ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
ruby-version: ${{ matrix.ruby }} | ||
bundler-cache: true | ||
- name: Run tests | ||
run: bundle exec rake parallel_spec | ||
|
||
acceptance: | ||
needs: setup_matrix | ||
runs-on: ubuntu-20.04 | ||
env: | ||
BUNDLE_WITHOUT: development:test:release | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
include: ${{fromJson(needs.setup_matrix.outputs.puppet_beaker_test_matrix)}} | ||
name: "${{ matrix.name }}" | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Setup ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
ruby-version: '3.3' | ||
bundler-cache: true | ||
- name: Start squid | ||
run: ./scripts/start-squid.sh | ||
- name: Run tests | ||
run: bundle exec rake beaker | ||
env: ${{ matrix.env }} | ||
- name: squid logs | ||
run: docker logs squid --tail 50 | ||
if: always() | ||
|
||
tests: | ||
needs: | ||
- unit | ||
- acceptance | ||
runs-on: ubuntu-latest | ||
name: Test suite | ||
steps: | ||
- run: echo Test suite completed | ||
jobs: | ||
puppet: | ||
name: Puppet | ||
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
--- | ||
spec/spec_helper.rb: | ||
spec_overrides: "require 'spec_helper_methods'" | ||
.github/workflows/ci.yml: | ||
unmanaged: true |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters