diff options
author | Corey Hemminger <hemminger@hotmail.com> | 2022-12-06 14:27:14 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-06 15:27:14 -0500 |
commit | a1028dd01811d5da6f5e91657de1c240b3f5996f (patch) | |
tree | 794bd3b29f6039ed8ad8dda4d389520634440b29 | |
parent | 62685d92c141c903dea5223e30db50cd0c955543 (diff) | |
download | chef-a1028dd01811d5da6f5e91657de1c240b3f5996f.tar.gz |
[chef-17] Pipeline fixes (#13399)
* Chef-17 Pipeline fixes
* kitchen pull client version 17
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
-rw-r--r-- | .github/workflows/func_spec.yml | 8 | ||||
-rw-r--r-- | .github/workflows/kitchen.yml | 8 | ||||
-rw-r--r-- | .github/workflows/lint.yml | 8 | ||||
-rw-r--r-- | .github/workflows/unit_specs.yml | 6 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb | 16 |
5 files changed, 23 insertions, 23 deletions
diff --git a/.github/workflows/func_spec.yml b/.github/workflows/func_spec.yml index 2247b414fd..7f3c0e975b 100644 --- a/.github/workflows/func_spec.yml +++ b/.github/workflows/func_spec.yml @@ -5,7 +5,7 @@ name: func_spec pull_request: push: branches: - - main + - chef-17 jobs: choco: @@ -17,7 +17,7 @@ jobs: ruby: [2.7, '3.0'] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} @@ -27,12 +27,12 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-10.15, macos-11] + os: [macos-11, macos-12] # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0' ruby: [2.7, '3.0'] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index fcc199de97..3b7f6fd9b6 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -15,7 +15,7 @@ jobs: os: [windows-2022, windows-2019] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Install Chef/Ohai from Omnitruck' id: install_chef run: | @@ -78,15 +78,15 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-10.15] # macos-11.0 is not public for now + os: [macos-12] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: 'Install Chef/Ohai from Omnitruck' id: install_chef run: | brew install coreutils - curl -L https://omnitruck.chef.io/install.sh | sudo bash -s -- -c current + curl -L https://omnitruck.chef.io/install.sh | sudo bash -s -- -c current -v 17 /opt/chef/bin/chef-client -v /opt/chef/bin/ohai -v /opt/chef/embedded/bin/rake --version diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1b9daa6aba..60e8bac7b8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,7 +5,7 @@ name: lint pull_request: push: branches: - - main + - chef-17 jobs: chefstyle: @@ -13,10 +13,10 @@ jobs: env: BUNDLE_WITHOUT: ruby_shadow:omnibus_package steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.0 bundler-cache: true - uses: r7kamura/rubocop-problem-matchers-action@v1 # this shows the failures in the PR - run: bundle exec chefstyle -c .rubocop.yml @@ -24,7 +24,7 @@ jobs: spellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: carlosperate/download-file-action@v1.0.3 id: download-custom-dictionary with: diff --git a/.github/workflows/unit_specs.yml b/.github/workflows/unit_specs.yml index fd0be0991f..a69eeffb79 100644 --- a/.github/workflows/unit_specs.yml +++ b/.github/workflows/unit_specs.yml @@ -5,19 +5,19 @@ name: unit_specs pull_request: push: branches: - - master + - chef-17 jobs: unit: strategy: fail-fast: false matrix: - os: [macos-10.15] # macos-11.0 is not public for now + os: [macos-12] # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0' ruby: ['3.0'] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb index e085519c4a..663b6e83bc 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb @@ -1,10 +1,10 @@ chef_client_trusted_certificate "self-signed.badssl.com" do certificate <<~CERT -----BEGIN CERTIFICATE----- -MIIDeTCCAmGgAwIBAgIJAMtEwC/G1C5xMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV +MIIDeTCCAmGgAwIBAgIJAJWlQWpveElqMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp c2NvMQ8wDQYDVQQKDAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTAeFw0y -MjA4MTIxNTU5MTBaFw0yNDA4MTExNTU5MTBaMGIxCzAJBgNVBAYTAlVTMRMwEQYD +MjEwMjcxOTA5MTBaFw0yNDEwMjYxOTA5MTBaMGIxCzAJBgNVBAYTAlVTMRMwEQYD VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQK DAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEB BQADggEPADCCAQoCggEBAMIE7PiM7gTCs9hQ1XBYzJMY61yoaEmwIrX5lZ6xKyx2 @@ -14,12 +14,12 @@ xPxTuW1CrbV8/q71FdIzSOciccfCFHpsKOo3St/qbLVytH5aohbcabFXRNsKEqve ww9HdFxBIuGa+RuT5q0iBikusbpJHAwnnqP7i/dAcgCskgjZjFeEU4EFy+b+a1SY QCeFxxC7c3DvaRhBB0VVfPlkPz0sw6l865MaTIbRyoUCAwEAAaMyMDAwCQYDVR0T BAIwADAjBgNVHREEHDAaggwqLmJhZHNzbC5jb22CCmJhZHNzbC5jb20wDQYJKoZI -hvcNAQELBQADggEBAKgnD+Ak7ttVfKvriYAsf4ttTYfOuyLfAr4hTTSXLN2u1ySD -fIpqSyeOkiEwfD5Bt7C/muEXEIyG/y6/C/ozb5JBvdd8c7zicLmaHtZtZbj4+H1b -/gqaBHuvWxiRR91bbgNaKsPMGCWiAvUt4/+y8z6xefUS+aKeFNhYjdwyFIr17j3Q -gxGpgCbYLLIoewP+Oj6xvZgGl6vj0xW9a4144xjFo1o1vqWkj+3IZGmnZ/jyznWd -5XzZCUaM9z6nn7NVxQZEelk885Q3oUxY96rRO+IUA8Vnk3iEtOdZPbNBaZwvgkfz -4vhvM8gKbdeeWoOAJDLzDZiDrUpKtIkBcLuJ7Cw= +hvcNAQELBQADggEBAHOCRfreG+y9q2jxDTYOYESH+SIOPh1a4TDKfWMGQ5shdW7Q +qlsRHqXmENFAalhHlNqGms1n77IdkIocygP9ZNZocyGwyLCDNn7YGdxCG4AlW2Lo +NW7Bs86GUhUrWtahHpOnmrjQ/zzDH1T9pBxUQwA72x3SdgvfFu+WuAU2Dg/X6Ely +IQ3a4/xy5NzlWsXBRvt67+uI2Fg3PGMenpWLD6SSLQzjjtEDXwv0dfBsYIt+m3QZ +gOHdx459vr8bpqjBz09izM2W/uYHcjixXQVpKujN9AA6a7c5hiGpfXPdhiUmaHup +CkR+c/8O1yyxkBMbttbp7VdUIXYAmB8yJuGoqe8= -----END CERTIFICATE----- CERT end |