diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 97371a501b..191785d51d 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -19,8 +19,8 @@ and/or use the pre-commit hook: https://github.com/renovatebot/pre-commit-hooks // Reuse predefined sets of configuration options to DRY "extends": [ - // https://github.com/containers/automation/blob/main/renovate/defaults.json5 - "github>containers/automation//renovate/defaults.json5" + // https://github.com/podman-container-tools/automation/blob/main/renovate/defaults.json5 + "github>podman-container-tools/automation//renovate/defaults.json5" ], /************************************************* diff --git a/.github/workflows/lima.yml b/.github/workflows/lima.yml index 8422e058ea..05d0385695 100644 --- a/.github/workflows/lima.yml +++ b/.github/workflows/lima.yml @@ -28,6 +28,12 @@ on: permissions: {} +env: + # CI automation repo release for the VM image downloads in ci.sh. + # ENV is managed by renovate, do not change the name without + # updating the renovate config in the automation repo. + AUTOMATION_RELEASE: 20260616t073924z + jobs: lima: if: ${{ inputs.if }} diff --git a/hack/ci/ci.sh b/hack/ci/ci.sh index ce079a5aec..b6136e6639 100755 --- a/hack/ci/ci.sh +++ b/hack/ci/ci.sh @@ -6,7 +6,7 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd) source "$SCRIPT_DIR/lib.sh" -AUTOMATION_RELEASE="20260616t073924z" # TODO should be renovate managed +AUTOMATION_RELEASE="${AUTOMATION_RELEASE:-$(get_automation_release)}" LIMA_VM_NAME=podman-ci REPO_DIR="$SCRIPT_DIR/../.." diff --git a/hack/ci/lib.sh b/hack/ci/lib.sh index 7f6d6928b7..9ed9f6aef3 100644 --- a/hack/ci/lib.sh +++ b/hack/ci/lib.sh @@ -111,3 +111,9 @@ function remove_packaged_podman_files() { sudo rm -f "$fullpath" done } + +# Reads and prints the AUTOMATION_RELEASE value from the workflow file. +# Used for local runs where ci.sh is not triggered by gh actions. +function get_automation_release() { + sed -En 's/.*AUTOMATION_RELEASE:\s(.*)/\1/p' .github/workflows/lima.yml +}