Skip to content

gitlab: run ostree manifest generation and builds only when needed #1961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thozza merged 1 commit into from
Oct 21, 2025
+7 −297
Merged

gitlab: run ostree manifest generation and builds only when needed #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
297 changes: 0 additions & 297 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,50 +1223,6 @@ fail:
needs:
- "generate-build-config: [rhel-9.8, x86_64]"

"generate-ostree-build-config: [centos-10, aarch64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-aarch64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro centos-10 --arch aarch64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [centos-10, aarch64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [centos-10, x86_64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro centos-10 --arch x86_64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [centos-10, x86_64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [centos-9, aarch64]":
stage: ostree-gen
extends: .terraform
Expand Down Expand Up @@ -1487,160 +1443,6 @@ fail:
- .cache/osbuild-images


"generate-ostree-build-config: [rhel-10.0, aarch64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-aarch64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro rhel-10.0 --arch aarch64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [rhel-10.0, aarch64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [rhel-10.0, x86_64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro rhel-10.0 --arch x86_64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [rhel-10.0, x86_64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [rhel-10.1, aarch64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-aarch64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro rhel-10.1 --arch aarch64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [rhel-10.1, aarch64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [rhel-10.1, x86_64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro rhel-10.1 --arch x86_64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [rhel-10.1, x86_64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [rhel-10.2, aarch64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-aarch64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro rhel-10.2 --arch aarch64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [rhel-10.2, aarch64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [rhel-10.2, x86_64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro rhel-10.2 --arch x86_64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [rhel-10.2, x86_64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [rhel-7.9, x86_64]":
stage: ostree-gen
extends: .terraform
variables:
RUNNER: aws/fedora-42-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-ostree-build-config --distro rhel-7.9 --arch x86_64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [rhel-7.9, x86_64]"
cache:
key: testcache
paths:
- .cache/osbuild-images


"generate-ostree-build-config: [rhel-8.10, aarch64]":
stage: ostree-gen
extends: .terraform
Expand Down Expand Up @@ -2080,28 +1882,6 @@ fail:
paths:
- .cache/osbuild-images

"image-build-ostree-trigger: [centos-10, aarch64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [centos-10, aarch64]"
strategy: depend
needs:
- "generate-ostree-build-config: [centos-10, aarch64]"


"image-build-ostree-trigger: [centos-10, x86_64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [centos-10, x86_64]"
strategy: depend
needs:
- "generate-ostree-build-config: [centos-10, x86_64]"


"image-build-ostree-trigger: [centos-9, aarch64]":
stage: ostree-build
trigger:
Expand Down Expand Up @@ -2212,83 +1992,6 @@ fail:
- "generate-ostree-build-config: [fedora-44, x86_64]"


"image-build-ostree-trigger: [rhel-10.0, aarch64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [rhel-10.0, aarch64]"
strategy: depend
needs:
- "generate-ostree-build-config: [rhel-10.0, aarch64]"


"image-build-ostree-trigger: [rhel-10.0, x86_64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [rhel-10.0, x86_64]"
strategy: depend
needs:
- "generate-ostree-build-config: [rhel-10.0, x86_64]"


"image-build-ostree-trigger: [rhel-10.1, aarch64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [rhel-10.1, aarch64]"
strategy: depend
needs:
- "generate-ostree-build-config: [rhel-10.1, aarch64]"


"image-build-ostree-trigger: [rhel-10.1, x86_64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [rhel-10.1, x86_64]"
strategy: depend
needs:
- "generate-ostree-build-config: [rhel-10.1, x86_64]"


"image-build-ostree-trigger: [rhel-10.2, aarch64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [rhel-10.2, aarch64]"
strategy: depend
needs:
- "generate-ostree-build-config: [rhel-10.2, aarch64]"


"image-build-ostree-trigger: [rhel-10.2, x86_64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [rhel-10.2, x86_64]"
strategy: depend
needs:
- "generate-ostree-build-config: [rhel-10.2, x86_64]"


"image-build-ostree-trigger: [rhel-7.9, x86_64]":
stage: ostree-build
trigger:
include:
- artifact: build-config.yml
job: "generate-ostree-build-config: [rhel-7.9, x86_64]"
strategy: depend
needs:
- "generate-ostree-build-config: [rhel-7.9, x86_64]"


"image-build-ostree-trigger: [rhel-8.10, aarch64]":
stage: ostree-build
trigger:
Expand Down
7 changes: 7 additions & 0 deletions test/scripts/generate-gitlab-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import imgtestlib as testlib
ARCHITECTURES = ["x86_64", "aarch64"]
MANIFEST_ONLY_ARCHES = ["ppc64le", "s390x"]
RUNNER = testlib.get_common_ci_runner()
OSTREE_DISTROS = ["fedora", "rhel-8", "rhel-9", "centos-9"]


BASE_CONFIG = """---
Expand Down Expand Up @@ -175,6 +176,12 @@ def main():
runner=RUNNER,
cache=cache))

for ostree_distro_prefix in OSTREE_DISTROS:
if img["distro"].startswith(ostree_distro_prefix):
break
else:
continue

ostree_gen_stage.append(OSTREE_GEN_TEMPLATE.format(
distro=img["distro"],
arch=img["arch"],
Expand Down
Loading