diff --git a/.github/workflows/ci_proposed.yml b/.github/workflows/ci_proposed.yml index 7fcb5cc..489a14b 100644 --- a/.github/workflows/ci_proposed.yml +++ b/.github/workflows/ci_proposed.yml @@ -49,7 +49,6 @@ jobs: # constant. If there is any future changes to how litmus ingest the inventory. # It may just fail. Good LUCK. - Acceptance: uses: "sooyean-hoo/cat-github-actions/.github/workflows/module_acceptance_prep.yml@dev_sooyean" secrets: "inherit" diff --git a/provision.yaml b/provision.yaml index a778588..36fb3ce 100644 --- a/provision.yaml +++ b/provision.yaml @@ -61,10 +61,31 @@ acceptance_vbox_rhel_8: ## Cannot find generic version for OracleLinux-7, SLES-12, Scientific-7, so Skipped them in tests. -## So no -## acceptance_vbox_oraclelinux_7 -## acceptance_vbox_sles_12 -## acceptance_vbox_scientificlinux_7 +## So use some other version. + +acceptance_vbox_oraclelinux_7: + provisioner: vagrant + images: ['Rendanic/oraclelinux-7.x' ] + vars: | + roles: ['master' ] + vagrant_password: 'piepiepiepiepiePIE51!' + vagrant_run_opts: ["-p 80:80", "-p 443:443", "-p 5432:5432","-p 8170:8170","-p 8143:8143", "-p 4433:4433","-p 8081:8081","-p 8142:8142", "-p 8140:8140","--privileged", "-v /var/run/docker.sock:/var/run/docker.sock" ] + +acceptance_vbox_sles_12: + provisioner: vagrant + images: ['idar/sles12' ] + vars: | + roles: ['master' ] + vagrant_password: 'piepiepiepiepiePIE51!' + vagrant_run_opts: ["-p 80:80", "-p 443:443", "-p 5432:5432","-p 8170:8170","-p 8143:8143", "-p 4433:4433","-p 8081:8081","-p 8142:8142", "-p 8140:8140","--privileged", "-v /var/run/docker.sock:/var/run/docker.sock" ] + +acceptance_vbox_scientificlinux_7: + provisioner: vagrant + images: ['bento/scientificlinux-7.9' ] + vars: | + roles: ['master' ] + vagrant_password: 'piepiepiepiepiePIE51!' + vagrant_run_opts: ["-p 80:80", "-p 443:443", "-p 5432:5432","-p 8170:8170","-p 8143:8143", "-p 4433:4433","-p 8081:8081","-p 8142:8142", "-p 8140:8140","--privileged", "-v /var/run/docker.sock:/var/run/docker.sock" ] diff --git a/spec/support/acceptance/vhelper.rb b/spec/support/acceptance/vhelper.rb index b2ee677..62f6cc6 100755 --- a/spec/support/acceptance/vhelper.rb +++ b/spec/support/acceptance/vhelper.rb @@ -74,7 +74,12 @@ gem install --force CFPropertyList -v 2.3.6 ; fi ; } - +function matrix_from_metadata(){ + matrix_from_metadata_v2 $@ ; + cat ${GITHUB_OUTPUT} ${GITHUB_OUTPUT}.tmp ; + cat ${GITHUB_OUTPUT} | grep matrix | sed -E 's/matrix=//g' | jq +} + function preinstallpecommands(){ sshverbose="-vvvvvv" ; sshverbose="" ; echo ;