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

terraform: update

Browse source 
- run only koji.sh for rhel-90 target, Fixes #1461

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-07-09 11:36:09 +02:00 • committed by Ondřej Budai
parent d1c48b4e84
commit e4d912f348
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

50
.gitlab-ci.yml
View file

@ -54,13 +54,13 @@ RPM:
- aws/fedora-33-aarch64 - aws/fedora-33-aarch64
- aws/fedora-34-x86_64 - aws/fedora-34-x86_64
- aws/fedora-34-aarch64 - aws/fedora-34-aarch64
- aws/rhel-8-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8-aarch64 - aws/rhel-8.4-ga-aarch64
- aws/centos-stream-8-x86_64 - aws/centos-stream-8-x86_64
- aws/centos-stream-8-aarch64 - aws/centos-stream-8-aarch64
- RUNNER: - RUNNER:
- aws/rhel-8.5-x86_64 - aws/rhel-8.5-nightly-x86_64
- aws/rhel-8.5-aarch64 - aws/rhel-8.5-nightly-aarch64
- aws/rhel-9.0-beta-nightly-x86_64 - aws/rhel-9.0-beta-nightly-x86_64
- aws/rhel-9.0-beta-nightly-aarch64 - aws/rhel-9.0-beta-nightly-aarch64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
@ -95,7 +95,7 @@ Prepare-rhel-internal:
- RUNNER: - RUNNER:
# NOTE: 1 runner prepares for all arches b/c subsequent jobs download # NOTE: 1 runner prepares for all arches b/c subsequent jobs download
# artifacts from all previous jobs and the last one wins # artifacts from all previous jobs and the last one wins
- aws/rhel-8.5-x86_64 - aws/rhel-8.5-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
Base: Base:
@ -115,13 +115,13 @@ Base:
# See COMPOSER-919 # See COMPOSER-919
# - aws/fedora-34-x86_64 # - aws/fedora-34-x86_64
# - aws/fedora-34-aarch64 # - aws/fedora-34-aarch64
- aws/rhel-8-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8-aarch64 - aws/rhel-8.4-ga-aarch64
- aws/centos-stream-8-x86_64 - aws/centos-stream-8-x86_64
- aws/centos-stream-8-aarch64 - aws/centos-stream-8-aarch64
- RUNNER: - RUNNER:
- aws/rhel-8.5-x86_64 - aws/rhel-8.5-nightly-x86_64
- aws/rhel-8.5-aarch64 - aws/rhel-8.5-nightly-aarch64
- aws/rhel-9.0-beta-nightly-x86_64 - aws/rhel-9.0-beta-nightly-x86_64
- aws/rhel-9.0-beta-nightly-aarch64 - aws/rhel-9.0-beta-nightly-aarch64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
@ -149,10 +149,10 @@ Regression:
- aws/centos-stream-8-x86_64 - aws/centos-stream-8-x86_64
- aws/centos-stream-8-aarch64 - aws/centos-stream-8-aarch64
- RUNNER: - RUNNER:
- aws/rhel-8-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8-aarch64 - aws/rhel-8.4-ga-aarch64
- aws/rhel-8.5-x86_64 - aws/rhel-8.5-nightly-x86_64
- aws/rhel-8.5-aarch64 - aws/rhel-8.5-nightly-aarch64
- aws/rhel-9.0-beta-nightly-x86_64 - aws/rhel-9.0-beta-nightly-x86_64
- aws/rhel-9.0-beta-nightly-aarch64 - aws/rhel-9.0-beta-nightly-aarch64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
@ -177,8 +177,8 @@ OSTree:
- openstack/fedora-33-x86_64 - openstack/fedora-33-x86_64
# See COMPOSER-919 # See COMPOSER-919
# - openstack/fedora-34-x86_64 # - openstack/fedora-34-x86_64
- openstack/rhel-8-x86_64 - openstack/rhel-8.4-ga-x86_64
- openstack/rhel-8.5-x86_64 - openstack/rhel-8.5-devel-x86_64
- openstack/rhel-9.0-beta-nightly-x86_64 - openstack/rhel-9.0-beta-nightly-x86_64
New OSTree: New OSTree:
@ -223,7 +223,7 @@ OSTree raw image:
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- openstack/rhel-8.5-x86_64 - openstack/rhel-8.5-devel-x86_64
.INTEGRATION_TESTS: &INTEGRATION_TESTS .INTEGRATION_TESTS: &INTEGRATION_TESTS
SCRIPT: SCRIPT:
@ -259,13 +259,13 @@ Integration:
- aws/centos-stream-8-x86_64 - aws/centos-stream-8-x86_64
- <<: *INTEGRATION_TESTS - <<: *INTEGRATION_TESTS
RUNNER: RUNNER:
- aws/rhel-8-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8.5-x86_64 - aws/rhel-8.5-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
- SCRIPT: - SCRIPT:
- azure_hyperv_gen2.sh - azure_hyperv_gen2.sh
RUNNER: RUNNER:
- aws/rhel-8.5-x86_64 - aws/rhel-8.5-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
- SCRIPT: - SCRIPT:
- aws.sh - aws.sh
@ -308,8 +308,8 @@ API:
- aws/centos-stream-8-x86_64 - aws/centos-stream-8-x86_64
- <<: *API_TESTS - <<: *API_TESTS
RUNNER: RUNNER:
- aws/rhel-8-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8.5-x86_64 - aws/rhel-8.5-nightly-x86_64
- aws/rhel-9.0-beta-nightly-x86_64 - aws/rhel-9.0-beta-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
@ -328,8 +328,8 @@ libvirt:
- openstack/fedora-33-x86_64 - openstack/fedora-33-x86_64
- openstack/centos-stream-8-x86_64 - openstack/centos-stream-8-x86_64
- RUNNER: - RUNNER:
- openstack/rhel-8-x86_64 - openstack/rhel-8.4-ga-x86_64
- openstack/rhel-8.5-x86_64 - openstack/rhel-8.5-devel-x86_64
- openstack/rhel-9.0-beta-nightly-x86_64 - openstack/rhel-9.0-beta-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
@ -342,7 +342,7 @@ RHEL 9 on 8:
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/koji.sh - /usr/libexec/tests/osbuild-composer/koji.sh
variables: variables:
RUNNER: aws/rhel-8-x86_64 RUNNER: aws/rhel-8.4-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
DISTRO_CODE: rhel-90 DISTRO_CODE: rhel-90
@ -377,7 +377,7 @@ Installer:
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- openstack/rhel-8.5-x86_64 - openstack/rhel-8.5-devel-x86_64
- openstack/rhel-9.0-beta-nightly-x86_64 - openstack/rhel-9.0-beta-nightly-x86_64
SCHEDULED_CLOUD_CLEANER: SCHEDULED_CLOUD_CLEANER:

2
schutzbot/terraform
View file

@ -1 +1 @@
e574b855f5a26d2b3bf1e75760a3bb653425c447 cf3b799d20d18084a7337e12d2e48d48b716b305