diff options
| author | tpowell-progress <104777878+tpowell-progress@users.noreply.github.com> | 2023-01-27 13:01:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 16:01:09 -0500 |
| commit | 3e1c3b56d8c7da4dc43521817c10e08bb7008f8b (patch) | |
| tree | e9ddaf01a6241d03c5cd7c3421142bee54aa5a73 | |
| parent | 2b9a033302eda271cba47de01f6af617816d1e63 (diff) | |
| download | chef-3e1c3b56d8c7da4dc43521817c10e08bb7008f8b.tar.gz | |
Fix kitchen tests for Amazon Linux 2 and (#13536)
* Fix kitchen tests for Amazon Linux 2 and Oracle Linux 7
* Added explanation why we have a separate 20.04 base for .github kitchen tests
* Update expired certificate used in kitchen tests
Signed-off-by: Neha Pansare <neha.pansare@progress.com>
---------
Signed-off-by: Thomas Powell <powell@progress.com>
Signed-off-by: Neha Pansare <neha.pansare@progress.com>
Co-authored-by: Neha Pansare <neha.pansare@progress.com>
| -rw-r--r-- | .github/workflows/kitchen.yml | 29 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb | 16 |
2 files changed, 35 insertions, 10 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 52f3b2187f..6ef05c8b35 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -117,7 +117,6 @@ jobs: fail-fast: false matrix: os: - - 'amazonlinux-2' - 'centos-6' - 'centos-7' - 'centos-8' @@ -126,7 +125,6 @@ jobs: - 'debian-11' - 'fedora-latest' - 'opensuse-leap-15' - - 'oraclelinux-7' - 'oraclelinux-8' - 'ubuntu-1804' - 'ubuntu-2004' @@ -148,3 +146,30 @@ jobs: working-directory: kitchen-tests run: | bundle exec kitchen test end-to-end-${{ matrix.os }} + + # Amazon Linux 2 and Oracle Linux 7 dokken images have systemctl issues + # on Ubuntu 22.04 host platforms and later. Pin these to Ubuntu 20.04 + linux-2004-host: + strategy: + fail-fast: false + matrix: + os: + - 'amazonlinux-2' + - 'oraclelinux-7' + runs-on: ubuntu-20.04 + env: + FORCE_FFI_YAJL: ext + CHEF_LICENSE: accept-no-persist + steps: + - name: Check out code + uses: actions/checkout@main + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: "3.0" + bundler-cache: true + working-directory: kitchen-tests + - name: Run Test Kitchen + working-directory: kitchen-tests + run: | + bundle exec kitchen test end-to-end-${{ matrix.os }} 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 663b6e83bc..813b92d37b 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----- -MIIDeTCCAmGgAwIBAgIJAJWlQWpveElqMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV +MIIDeTCCAmGgAwIBAgIJAKAyAEjwDBuPMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp c2NvMQ8wDQYDVQQKDAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTAeFw0y -MjEwMjcxOTA5MTBaFw0yNDEwMjYxOTA5MTBaMGIxCzAJBgNVBAYTAlVTMRMwEQYD +MzAxMjIxNzM2NTVaFw0yNTAxMjExNzM2NTVaMGIxCzAJBgNVBAYTAlVTMRMwEQYD VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQK DAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEB BQADggEPADCCAQoCggEBAMIE7PiM7gTCs9hQ1XBYzJMY61yoaEmwIrX5lZ6xKyx2 @@ -14,12 +14,12 @@ xPxTuW1CrbV8/q71FdIzSOciccfCFHpsKOo3St/qbLVytH5aohbcabFXRNsKEqve ww9HdFxBIuGa+RuT5q0iBikusbpJHAwnnqP7i/dAcgCskgjZjFeEU4EFy+b+a1SY QCeFxxC7c3DvaRhBB0VVfPlkPz0sw6l865MaTIbRyoUCAwEAAaMyMDAwCQYDVR0T BAIwADAjBgNVHREEHDAaggwqLmJhZHNzbC5jb22CCmJhZHNzbC5jb20wDQYJKoZI -hvcNAQELBQADggEBAHOCRfreG+y9q2jxDTYOYESH+SIOPh1a4TDKfWMGQ5shdW7Q -qlsRHqXmENFAalhHlNqGms1n77IdkIocygP9ZNZocyGwyLCDNn7YGdxCG4AlW2Lo -NW7Bs86GUhUrWtahHpOnmrjQ/zzDH1T9pBxUQwA72x3SdgvfFu+WuAU2Dg/X6Ely -IQ3a4/xy5NzlWsXBRvt67+uI2Fg3PGMenpWLD6SSLQzjjtEDXwv0dfBsYIt+m3QZ -gOHdx459vr8bpqjBz09izM2W/uYHcjixXQVpKujN9AA6a7c5hiGpfXPdhiUmaHup -CkR+c/8O1yyxkBMbttbp7VdUIXYAmB8yJuGoqe8= +hvcNAQELBQADggEBAJs0hWIxX/T64bNZTJ5sTNJVzfxjUVNM0+X0eAi5e1HM9B4p +/YtnKz11OCiH6E5jDGyYL4mH2CmA5AuznfnupOJK+OQaoJmgy1DOrm0fXLnswYRJ +k6uuaJhB585gzWUqhoVxJusTZPItKLGfBH6i1C5o/LPr0PKagddIrzs5woArmtbc +FK0EQxrk4aWHGQbVccu1K1SAWW3PmYNo/gn3tiCSYcV+4BCOmNhtkd0C4r2VqYuA +8ynhAuRdoznncGjYvaXibb7hMFTas/OiETCWn1V4nY1VxGUqPzG2OunOOF8G16mm +icTHkmckrm2kiDUkB+Uy/m88mElTpeuGWOX7BrU= -----END CERTIFICATE----- CERT end |