Skip to content
Merged
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
166 changes: 0 additions & 166 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -515,40 +515,6 @@ fail:
- init


"generate-build-config: [rhel-9.0, aarch64]":
stage: gen
extends: .terraform
variables:
RUNNER: aws/fedora-44-aarch64
INTERNAL_NETWORK: "true"
script:
- sudo -E ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-build-config --distro rhel-9.0 --arch aarch64 build-config.yml
artifacts:
paths:
- build-config.yml
needs:
- init


"generate-build-config: [rhel-9.0, x86_64]":
stage: gen
extends: .terraform
variables:
RUNNER: aws/fedora-44-x86_64
INTERNAL_NETWORK: "true"
script:
- sudo -E ./test/scripts/setup-osbuild-repo
- sudo ./test/scripts/install-dependencies
- ./test/scripts/generate-build-config --distro rhel-9.0 --arch x86_64 build-config.yml
artifacts:
paths:
- build-config.yml
needs:
- init


"generate-build-config: [rhel-9.2, aarch64]":
stage: gen
extends: .terraform
Expand Down Expand Up @@ -1015,28 +981,6 @@ fail:
- "generate-build-config: [rhel-8.8, x86_64]"


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


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


"image-build-trigger: [rhel-9.2, aarch64]":
stage: build
trigger:
Expand Down Expand Up @@ -1605,42 +1549,6 @@ fail:
- "image-build-trigger: [rhel-8.8, x86_64]"


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


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


"generate-ostree-build-config: [rhel-9.2, aarch64]":
stage: ostree-gen
extends: .terraform
Expand Down Expand Up @@ -1996,28 +1904,6 @@ fail:
- "generate-ostree-build-config: [rhel-8.8, x86_64]"


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


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


"image-build-ostree-trigger: [rhel-9.2, aarch64]":
stage: ostree-build
trigger:
Expand Down Expand Up @@ -2803,58 +2689,6 @@ fail:
- init


"generate-manifests: [rhel-9.0, ppc64le]":
stage: gen
extends: .terraform
variables:
RUNNER: aws/fedora-44-x86_64
INTERNAL_NETWORK: "true"
script: |
sudo -E ./test/scripts/setup-osbuild-repo
sudo ./test/scripts/install-dependencies
echo "GOPROXY=$GOPROXY"
go run ./cmd/gen-manifests --arches ppc64le --distros rhel-9.0 --workers 10 --metadata=false --output ./manifests
errors=0
for manifest in ./manifests/*; do
if osbuild --inspect $manifest > output; then
echo "$manifest OK";
else
echo "$manifest validation failed";
cat output;
errors+=1
fi;
done
exit "$errors"
needs:
- init


"generate-manifests: [rhel-9.0, s390x]":
stage: gen
extends: .terraform
variables:
RUNNER: aws/fedora-44-x86_64
INTERNAL_NETWORK: "true"
script: |
sudo -E ./test/scripts/setup-osbuild-repo
sudo ./test/scripts/install-dependencies
echo "GOPROXY=$GOPROXY"
go run ./cmd/gen-manifests --arches s390x --distros rhel-9.0 --workers 10 --metadata=false --output ./manifests
errors=0
for manifest in ./manifests/*; do
if osbuild --inspect $manifest > output; then
echo "$manifest OK";
else
echo "$manifest validation failed";
cat output;
errors+=1
fi;
done
exit "$errors"
needs:
- init


"generate-manifests: [rhel-9.2, ppc64le]":
stage: gen
extends: .terraform
Expand Down
21 changes: 4 additions & 17 deletions test/config-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -696,10 +696,10 @@
"filters": {
"distros": [
"rhel-8*",
"rhel-9.6",
"rhel-9.7",
"rhel-9.8",
"rhel-9.9",
"rhel-9*",
"rhel-9*",
"rhel-9*",
"rhel-9*",
Comment on lines +699 to +702

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What am I doing here?

"rhel-10*",
"centos-*",
"eln*"
Expand All @@ -710,19 +710,6 @@
]
}
},
{
"path": "./configs/disable-nm-cloud-setup.json",
"filters": {
"distros": [
"rhel-9.0",
"rhel-9.2",
"rhel-9.4"
],
"image-types": [
"vhd"
]
}
},
{
"path": "./configs/bootc-empty.json",
"filters": {
Expand Down
15 changes: 0 additions & 15 deletions test/configs/disable-nm-cloud-setup.json

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-aarch64-ami-empty

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-aarch64-ec2-empty

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-aarch64-tar-empty

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-aarch64-wsl-empty

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-ppc64le-tar-empty

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-s390x-qcow2-empty

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-s390x-tar-empty

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-x86_64-ami-empty

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-x86_64-ec2-empty

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion test/data/manifest-checksums/rhel_9.0-x86_64-gce-empty

This file was deleted.

Loading
Loading