CI: change api.sh argument and runner matrix
Call script with image type argument instead of target. Test only on RHEL. Signed-off-by: Achilleas Koutsou <achilleas@koutsou.net>
This commit is contained in:
parent
3ee31c23be
commit
842c9767b7
1 changed files with 4 additions and 17 deletions
|
|
@ -313,11 +313,11 @@ Integration:
|
||||||
INTERNAL_NETWORK: ["true"]
|
INTERNAL_NETWORK: ["true"]
|
||||||
|
|
||||||
.API_TESTS: &API_TESTS
|
.API_TESTS: &API_TESTS
|
||||||
TARGET:
|
IMAGE_TYPE:
|
||||||
- azure
|
|
||||||
- aws
|
- aws
|
||||||
|
- azure
|
||||||
|
- edge-commit
|
||||||
- gcp
|
- gcp
|
||||||
- aws.s3
|
|
||||||
|
|
||||||
API:
|
API:
|
||||||
stage: test
|
stage: test
|
||||||
|
|
@ -328,22 +328,9 @@ API:
|
||||||
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
|
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.6-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"'
|
||||||
script:
|
script:
|
||||||
- schutzbot/deploy.sh
|
- schutzbot/deploy.sh
|
||||||
- /usr/libexec/tests/osbuild-composer/api.sh ${TARGET}
|
- /usr/libexec/tests/osbuild-composer/api.sh ${IMAGE_TYPE}
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- <<: *API_TESTS
|
|
||||||
RUNNER:
|
|
||||||
- aws/fedora-33-x86_64
|
|
||||||
# See COMPOSER-919
|
|
||||||
# - aws/fedora-34-x86_64
|
|
||||||
# See COMPOSER-1118
|
|
||||||
# - aws/centos-stream-8-x86_64
|
|
||||||
- TARGET:
|
|
||||||
- aws
|
|
||||||
- gcp
|
|
||||||
- aws.s3
|
|
||||||
RUNNER:
|
|
||||||
- aws/centos-stream-8-x86_64
|
|
||||||
- <<: *API_TESTS
|
- <<: *API_TESTS
|
||||||
RUNNER:
|
RUNNER:
|
||||||
- aws/rhel-8.5-ga-x86_64
|
- aws/rhel-8.5-ga-x86_64
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue