Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/gobump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
jobs:
update-and-push:
runs-on: ubuntu-latest
container: registry.fedoraproject.org/fedora:42
container: registry.fedoraproject.org/fedora:43
steps:
- name: Update go.mod and open a PR
env:
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ jobs:
matrix:
fedora_version:
- name: previous
version: 42
- name: current
version: 43
# Enable this when we get osbuild rpm builds for Fedora 44
# - name: rawhide
# version: rawhide
# continue-on-error: true
- name: current
version: 44
- name: rawhide
version: rawhide
continue-on-error: true
fail-fast: false # if one fails, keep the other(s) running
name: "🛃 Unit tests (Fedora ${{ matrix.fedora_version.name }})"
runs-on: ubuntu-24.04
Expand Down
150 changes: 0 additions & 150 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,36 +115,6 @@ fail:
- build-config.yml


"generate-build-config: [fedora-42, aarch64]":
stage: 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-build-config --distro fedora-42 --arch aarch64 build-config.yml
artifacts:
paths:
- build-config.yml


"generate-build-config: [fedora-42, x86_64]":
stage: 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-build-config --distro fedora-42 --arch x86_64 build-config.yml
artifacts:
paths:
- build-config.yml


"generate-build-config: [fedora-43, aarch64]":
stage: gen
extends: .terraform
Expand Down Expand Up @@ -743,28 +713,6 @@ fail:
- "generate-build-config: [centos-9, x86_64]"


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


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


"image-build-trigger: [fedora-43, aarch64]":
stage: build
trigger:
Expand Down Expand Up @@ -1207,42 +1155,6 @@ fail:
- "image-build-trigger: [centos-9, x86_64]"


"generate-ostree-build-config: [fedora-42, 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 fedora-42 --arch aarch64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [fedora-42, aarch64]"


"generate-ostree-build-config: [fedora-42, 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 fedora-42 --arch x86_64 build-config.yml build-configs
artifacts:
paths:
- build-config.yml
- build-configs
needs:
- "image-build-trigger: [fedora-42, x86_64]"


"generate-ostree-build-config: [fedora-43, aarch64]":
stage: ostree-gen
extends: .terraform
Expand Down Expand Up @@ -1768,28 +1680,6 @@ fail:
- "generate-ostree-build-config: [centos-9, x86_64]"


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


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


"image-build-ostree-trigger: [fedora-43, aarch64]":
stage: ostree-build
trigger:
Expand Down Expand Up @@ -2177,46 +2067,6 @@ fail:
done


"generate-manifests: [fedora-42, ppc64le]":
stage: 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
- echo "GOPROXY=$GOPROXY"
- go run ./cmd/gen-manifests --arches ppc64le --distros fedora-42 --workers 10 --metadata=false --output ./manifests
- for manifest in ./manifests/*; do
if osbuild --inspect $manifest > output; then
echo "$manifest OK";
else
cat output;
fi;
done


"generate-manifests: [fedora-42, s390x]":
stage: 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
- echo "GOPROXY=$GOPROXY"
- go run ./cmd/gen-manifests --arches s390x --distros fedora-42 --workers 10 --metadata=false --output ./manifests
- for manifest in ./manifests/*; do
if osbuild --inspect $manifest > output; then
echo "$manifest OK";
else
cat output;
fi;
done


"generate-manifests: [fedora-43, ppc64le]":
stage: gen
extends: .terraform
Expand Down
39 changes: 5 additions & 34 deletions Schutzfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,54 +34,25 @@
}
}
},
"fedora-42": {
"fedora-43": {
"dependencies": {
"osbuild": {
"commit": "31bf3c482238aa4cd3c57be6cf6b3a731788a9f0"
}
},
"repos": [
{
"file": "/etc/yum.repos.d/fedora.repo",
"x86_64": [
{
"title": "fedora",
"name": "fedora",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-x86_64-fedora-20250512"
},
{
"title": "fedora-updates",
"name": "fedora-updates",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-x86_64-updates-released-20260426"
}
],
"aarch64": [
{
"title": "fedora",
"name": "fedora",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-aarch64-fedora-20250512"
},
{
"title": "fedora-updates",
"name": "fedora-updates",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-aarch64-updates-released-20260426"
}
]
}
]
}
},
"fedora-43": {
"fedora-44": {
"dependencies": {
"osbuild": {
"commit": "31bf3c482238aa4cd3c57be6cf6b3a731788a9f0"
}
}
},
"fedora-44": {
"fedora-45": {
"dependencies": {
"osbuild": {
"commit": "31bf3c482238aa4cd3c57be6cf6b3a731788a9f0"
}
}
}
}
}
Loading
Loading