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

Jump to bottom

Cirrus: Use versionable IMAGE_SUFFIX #17166

Merged
merged 1 commit into from
Feb 2, 2023
Merged

Cirrus: Use versionable IMAGE_SUFFIX #17166

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
40 changes: 5 additions & 35 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ env:

####
#### Cache-image names to test with (double-quotes around names are critical)
#### Comment out fedora-35 for podman 4.x branches.
####
FEDORA_NAME: "fedora-37"
FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64"
PRIOR_FEDORA_NAME: "fedora-36"
UBUNTU_NAME: "ubuntu-2204"
FEDORA_NAME: "fedora-37" ### c20230120t152650z-f37f36u2204
FEDORA_AARCH64_NAME: "${FEDORA_NAME}-aarch64" ### c20230120t152650z-f37f36u2204
PRIOR_FEDORA_NAME: "fedora-36" ### c20230120t152650z-f37f36u2204
#UBUNTU_NAME: "ubuntu-2204" ### c20230120t152650z-f37f36u2204
Comment on lines +29 to +32
Copy link
Member

Choose a reason for hiding this comment

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

Are these nasty comments absolutely necessary? I've been reviewing this indirectly via #17305 and the constant changes in comment are distracting.

Copy link
Member Author

@cevich cevich Feb 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Not absolutely necessary. They're there because there's no other (easy) way to associate a IMAGE_SUFFIX value with any of the *_NAME values. In other words, I want maintainers to notice quickly if renovate suggests an incompatible update - i.e. replacing F37 with F38.

However, the current rules treat everything after the - as a "compatibility" value, so (assuming that works) the comment is just a "CYA" value that gets updated with images. Hopefully prompting a maintainer to check - for example, yep, these images still cover "Fedora-36".

Maybe this is just a corner-case we can ignore though?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll endeavor to remove these comments when I come across them. Such as in #17305

Copy link
Member

Choose a reason for hiding this comment

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

SGTM


# Image identifiers
IMAGE_SUFFIX: "c5841131699699712"
IMAGE_SUFFIX: "c20230120t152650z-f37f36u2204"
# EC2 images
FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}"
Expand Down Expand Up @@ -855,34 +854,6 @@ buildah_bud_test_task:
always: *int_logs_artifacts


#rootless_gitlab_test_task:
# name: *std_name_fmt
# alias: rootless_gitlab_test
# # Docs: ./contrib/cirrus/CIModes.md
# only_if: &cirrus_cron "${CIRRUS_CRON} == 'main'"
# # Community-maintained downstream test may fail unexpectedly.
# # Ref. repository: https://gitlab.com/gitlab-org/gitlab-runner
# # If necessary, uncomment the next line and file issue(s) with details.
# # allow_failures: $CI == $CI
# depends_on:
# - build
# - rootless_integration_test
# gce_instance: *standardvm
# env:
# <<: *ubuntu_envvars
# TEST_FLAVOR: 'gitlab'
# PRIV_NAME: rootless
# clone_script: *get_gosrc
# setup_script: *setup
# main_script: *main
# always:
# <<: *logs_artifacts
# junit_artifacts:
# path: gitlab-runner-podman.xml
# type: text/xml
# format: junit


upgrade_test_task:
name: "Upgrade test: from $PODMAN_UPGRADE_FROM"
alias: upgrade_test
Expand Down Expand Up @@ -1028,7 +999,6 @@ success_task:
- rootless_remote_system_test
- minikube_test
- buildah_bud_test
#- rootless_gitlab_test
- upgrade_test
- image_build
- meta
Expand Down
2 changes: 1 addition & 1 deletion contrib/cirrus/prebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set +a

req_env_vars CI DEST_BRANCH IMAGE_SUFFIX TEST_FLAVOR TEST_ENVIRON \
PODBIN_NAME PRIV_NAME DISTRO_NV AUTOMATION_LIB_PATH \
SCRIPT_BASE CIRRUS_WORKING_DIR FEDORA_NAME UBUNTU_NAME \
SCRIPT_BASE CIRRUS_WORKING_DIR FEDORA_NAME \
VM_IMAGE_NAME

# Defined by the CI system
Expand Down