From 09280f4525a13605a8081a4aa22470ae6a34be93 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 3 Apr 2024 17:48:39 +0300 Subject: [PATCH] Revert "drop target check to a 7 day window before paging (#207)" (#210) This reverts commit 3b28b424b66cff8c0ea3a10517965d45f1d1ded0 that was made because root-signing-staging metadata was within 15 days of expiry and prober was pinging on-call. This should not be an issue any more. Signed-off-by: Jussi Kukkonen --- .github/workflows/reusable-prober.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reusable-prober.yml b/.github/workflows/reusable-prober.yml index 89b7b81..d9b8a93 100644 --- a/.github/workflows/reusable-prober.yml +++ b/.github/workflows/reusable-prober.yml @@ -161,9 +161,9 @@ jobs: verify repository --repository ${{ inputs.tuf_repo }} --root ${ROOT_PATH} --valid-until ${EXPIRY} --dedup-key-file ${PD_DEDUP_KEY_FILE} || (echo "dedup_key=$(cat ${PD_DEDUP_KEY_FILE})" >> $GITHUB_OUTPUT ; exit 1) echo "::endgroup::" - echo "::group::tuf-repo-cdn 7 day check" - export EXPIRY=$(date -d '+7 days' '+%s') - echo "Verifying root valid within 7 days..." + echo "::group::tuf-repo-cdn 15 day check" + export EXPIRY=$(date -d '+15 days' '+%s') + echo "Verifying root valid within 15 days..." verify repository --repository ${{ inputs.tuf_repo }} --root ${ROOT_PATH} --valid-until ${EXPIRY} --role root.json --role targets.json --dedup-key-file ${PD_DEDUP_KEY_FILE} || (echo "dedup_key=$(cat ${PD_DEDUP_KEY_FILE})" >> $GITHUB_OUTPUT ; exit 1) echo "::endgroup::" @@ -173,9 +173,9 @@ jobs: verify repository --repository ${{ inputs.tuf_preprod_repo }} --root ${ROOT_PATH} --valid-until ${EXPIRY} --dedup-key-file ${PD_DEDUP_KEY_FILE} || (echo "dedup_key=$(cat ${PD_DEDUP_KEY_FILE})" >> $GITHUB_OUTPUT ; exit 1) echo "::endgroup::" - echo "::group::tuf-preprod-repo-cdn 7 day check" - export EXPIRY=$(date -d '+7 days' '+%s') - echo "Verifying root valid within 7 days..." + echo "::group::tuf-preprod-repo-cdn 15 day check" + export EXPIRY=$(date -d '+15 days' '+%s') + echo "Verifying root valid within 15 days..." verify repository --repository ${{ inputs.tuf_preprod_repo }} --root ${ROOT_PATH} --valid-until ${EXPIRY} --role root.json --role targets.json --dedup-key-file ${PD_DEDUP_KEY_FILE} || (echo "dedup_key=$(cat ${PD_DEDUP_KEY_FILE})" >> $GITHUB_OUTPUT ; exit 1) echo "::endgroup::"