particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update more test conditions based on code review

Browse source
This commit is contained in:
Alexander Todorov 2022-12-19 15:44:19 +02:00 • committed by Jakub Rusz
parent ccd54a2c99
commit 6d0c8ced8d
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.gitlab-ci.yml
View file

@ -74,10 +74,6 @@ init:
RUNNER:
- aws/rhel-8.8-nightly-x86_64
- aws/rhel-8.8-nightly-aarch64
- aws/rhel-8.8-nightly-x86_64
- aws/rhel-8.8-nightly-aarch64
- aws/rhel-9.2-nightly-x86_64
- aws/rhel-9.2-nightly-aarch64
- aws/rhel-9.2-nightly-x86_64
- aws/rhel-9.2-nightly-aarch64
@ -252,7 +248,7 @@ regression-bigiso:
extends: .regression
rules:
# WHITELIST: Run only on x86_64 and rhel like systems
- if: $RUNNER =~ "/^.*(rhel-8.6.*x86_64|rhel-9.0.*x86_64|centos-stream-8.*x86_64|centos-stream-9.*x86_64).*$/" && $CI_PIPELINE_SOURCE != "schedule"
- if: $RUNNER =~ "/^.*(rhel-8.*x86_64|rhel-9.*x86_64|centos-stream-8.*x86_64|centos-stream-9.*x86_64).*$/" && $CI_PIPELINE_SOURCE != "schedule"
variables:
SCRIPT: regression-bigiso.sh
@ -278,7 +274,7 @@ regression-excluded-dependency:
extends: .regression
rules:
# WHITELIST
- if: $RUNNER =~ "/^.*(rhel-8.6|rhel-9.0|centos-stream-8|centos-stream-9).*$/" && $CI_PIPELINE_SOURCE != "schedule"
- if: $RUNNER =~ "/^.*(rhel-8.*|rhel-9.*|centos-stream-8|centos-stream-9).*$/" && $CI_PIPELINE_SOURCE != "schedule"
- !reference [.nightly_rules_all, rules]
variables:
SCRIPT: regression-excluded-dependency.sh
@ -500,7 +496,7 @@ koji.sh (cloud upload):
parallel:
matrix:
- RUNNER:
# Brew workers use RHEL-8.6
# Brew workers use RHEL-8.7
- aws/rhel-8.7-ga-x86_64
INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: aws
@ -680,7 +676,7 @@ Multi-tenancy:
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/multi-tenancy.sh
variables:
# only 8.6 GA b/c the Image Builder service runs on RHEL 8
# only 8.7 GA b/c the Image Builder service runs on RHEL 8
RUNNER: aws/rhel-8.7-ga-x86_64
INTERNAL_NETWORK: "true"

2
test/cases/multi-tenancy.sh
View file

@ -63,7 +63,7 @@ sudo cp \
"${OSBUILD_COMPOSER_TEST_DATA}"/kerberos/krb5-local.conf \
/etc/krb5.conf.d/local
DISTRO=rhel-86
DISTRO=rhel-87
function s3_request {
cat <<EOF

2
test/cases/ostree-simplified-installer.sh
View file

@ -892,7 +892,7 @@ check_result
##
########################################################################
if [[ "${ID}-${VERSION_ID}" = "rhel-9.1" || "${ID}-${VERSION_ID}" = "centos-9" ]]; then
if [[ "${ID}-${VERSION_ID}" = "rhel-9.2" || "${ID}-${VERSION_ID}" = "centos-9" ]]; then
tee "$BLUEPRINT_FILE" > /dev/null <<EOF
name = "simplified_iso_with_ignition_embedded_url"
description = "A rhel-edge simplified-installer image with an embedded ignition config URL"