Skip to content
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

🤖 Run bundles test on tumbleweed #1961

Merged
merged 3 commits into from
Oct 26, 2023
Merged

🤖 Run bundles test on tumbleweed #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ed206b
:robot: Run bundles test on tumbleweed
Itxaka Oct 26, 2023
d163f3d
:robot: Fix image-pr requiring family to download the release
Itxaka Oct 26, 2023
c07f5ef
:robot: Fix os-release
Itxaka Oct 26, 2023
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
1 change: 1 addition & 0 deletions .github/workflows/image-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ jobs:
with:
flavor: ubuntu
flavor_release: "23.04"
family: "ubuntu"
needs:
- core

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
matrix:
include:
- flavor: opensuse # Kubo test needs systemd version 252+ which atm is not available in Leap
flavorRelease: leap-15.5
flavorRelease: tumbleweed
reset:
uses: ./.github/workflows/reusable-qemu-reset-test.yaml
with:
Expand Down Expand Up @@ -255,7 +255,6 @@ jobs:
flavorRelease: "3.18"
family: alpine
baseImage: alpine:3.18

various:
uses: ./.github/workflows/reusable-provider-tests.yaml
with:
Expand Down Expand Up @@ -306,7 +305,6 @@ jobs:
# cant do alpine yet as it hasnt been released with the proper name
#- flavor: "alpine"
# flavorRelease: "3.18"

notify:
runs-on: ubuntu-latest
if: failure()
Expand Down
7 changes: 5 additions & 2 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,11 @@ OSRELEASE:
ARG --required KAIROS_VERSION

COPY ./naming.sh .
ARG OS_REPO=$(./naming.sh container_artifact_name)
ARG OS_NAME=$(./naming.sh common_artifact_name)

# quay.io/kairos/alpine or quay.io/kairos/ubuntu for example as this is just the repo
ARG OS_REPO=$(./naming.sh container_artifact_repo)
# kairos-core-alpine-3.18 or kairos-standard-ubuntu-20.04 for example
ARG OS_NAME=kairos-${VARIANT}-${FLAVOR}-${FLAVOR_RELEASE}

ARG OS_VERSION=$KAIROS_VERSION
ARG OS_LABEL=$KAIROS_VERSION
Expand Down
19 changes: 19 additions & 0 deletions naming.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,22 @@ container_artifact_name() {
echo "$REGISTRY_AND_ORG/$FLAVOR:$tag"
}

# returns the repo name for the container artifact
# for example quay.io/kairos/opensuse or quake.io/kairos/alpine
container_artifact_repo() {
if [ -z "$FLAVOR" ]; then
echo 'FLAVOR must be defined'
exit 1
fi

if [ -z "$REGISTRY_AND_ORG" ]; then
echo 'REGISTRY_AND_ORG must be defined'
exit 1
fi

echo "$REGISTRY_AND_ORG/$FLAVOR"
}


if [ -n "$ARTIFACT_JSON" ]; then
setEnvVarsFromJSON
Expand All @@ -94,6 +110,9 @@ case "$1" in
"common_artifact_name")
common_artifact_name
;;
"container_artifact_repo")
container_artifact_repo
;;
*)
echo "Function not found: $1"
exit 1
Expand Down
Loading