Skip to content

Commit

Permalink
Merge pull request #348 from cevich/bump_automation_lib
Browse files Browse the repository at this point in the history
Bump automation library version
  • Loading branch information
cevich authored Apr 24, 2024
2 parents cf72ba2 + c3a0ca1 commit 64e25fa
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
13 changes: 7 additions & 6 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ container_images_task: &container_images
skip: *ci_docs_tooling
depends_on:
- image_builder
timeout_in: 40m
timeout_in: &cntr_timeout 40m
gce_instance: &ibi_vm
image_project: "libpod-218412"
# Trust whatever was built most recently is functional
Expand Down Expand Up @@ -117,7 +117,7 @@ imgts_build_task:
skip: &ci_docs $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*'
depends_on:
- image_builder
timeout_in: 30m
timeout_in: *cntr_timeout
gce_instance: *ibi_vm
env: *image_env
script: |
Expand All @@ -133,7 +133,7 @@ tooling_images_task:
skip: *ci_docs
depends_on:
- imgts_build
timeout_in: 30m
timeout_in: *cntr_timeout
gce_instance: *ibi_vm
env: *image_env
matrix:
Expand Down Expand Up @@ -474,9 +474,10 @@ test_build-push_task:
# More muscle to emulate multi-arch
type: "n2-standard-4"
script: |
git clone --depth=1 https://github.com/containers/image_build.git ../ib
bash ../ib/build-push/.install.sh
bash ../ib/build-push/test.sh
mkdir /tmp/context
echo -e "FROM scratch\nENV foo=bar\n" > /tmp/context/Containerfile
source /etc/automation_environment
A_DEBUG=1 build-push.sh --nopush --arches=amd64,arm64,s390x,ppc64le example.com/foo/bar /tmp/context
tag_latest_images_task:
Expand Down
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240411t124913z-f39f38d13
20240424t143933z-f39f38d13
2 changes: 1 addition & 1 deletion lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OS_REL_VER="$OS_RELEASE_ID-$OS_RELEASE_VER"
PACKAGE_DOWNLOAD_DIR=/var/cache/download

# N/B: This is managed by renovate
INSTALL_AUTOMATION_VERSION="5.0.0"
INSTALL_AUTOMATION_VERSION="5.0.1"

# Mask secrets in show_env_vars() from automation library
SECRET_ENV_RE='(^PATH$)|(^BASH_FUNC)|(^_.*)|(.*PASSWORD.*)|(.*TOKEN.*)|(.*SECRET.*)|(.*ACCOUNT.*)|(.+_JSON)|(AWS.+)|(.*SSH.*)|(.*GCP.*)'
Expand Down

0 comments on commit 64e25fa

Please sign in to comment.