Merge branch 'pipeline-cleanup' into 'main'

Add -dev eln versions too

See merge request CentOS/cloud/sagano!37
This commit is contained in:
Colin Walters 2023-10-11 18:33:24 +00:00
commit eb2e67263c
6 changed files with 18 additions and 11 deletions

View File

@ -19,15 +19,8 @@ stages:
- tier-0
- tier-1
OS: fedora
VERSION: ["38"]
VERSION: ["38", "eln"]
VARIANT: ["", "-dev"]
# TODO add -dev for eln
- TIER:
- tier-0
- tier-1
OS: fedora
VERSION: ["eln"]
VARIANT: [""]
.default-target: fedora-tier-1-38
test-build:
@ -36,7 +29,6 @@ test-build:
- merge_requests
stage: build
script:
- rpm-ostree install distribution-gpg-keys
- set -euo pipefail; rpm-ostree compose image --format=ociarchive --initialize ${OS}-${TIER}${VARIANT}-${VERSION}.yaml dest.oci-archive
build-push:

View File

@ -39,6 +39,8 @@ users and passwords that way.
- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-0:38`
- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1:38`
- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-0:eln`
- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1:eln`
# Image matrix (CentOS Stream 9)
@ -47,6 +49,13 @@ users and passwords that way.
- `registry.gitlab.com/centos/cloud/sagano/centos-boot-tier-1:stream9`
- `registry.gitlab.com/centos/cloud/sagano/centos-boot-tier-1-rt:stream9` (realtime kernel)
# Image matrix (Fedora development)
These images pull from git main/master of RPMs using COPRs for selected projects.
- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-0-dev:38`
- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1-dev:38`
## More about image sources
The current manifest definitions [tier-0](tier-0) and [tier-1](tier-1) were forked from Fedora CoreOS, but significantly

View File

@ -0,0 +1,3 @@
include:
- fedora-tier-0-38.yaml
- fedora-dev.yaml

View File

@ -1,4 +1,4 @@
releasever: 40
releasever: 39
repos:
- eln-baseos

View File

@ -0,0 +1,3 @@
include:
- fedora-tier-1-eln.yaml
- fedora-dev.yaml

View File

@ -1,4 +1,4 @@
releasever: 40
releasever: 39
repos:
- eln-baseos