From 6c01e4fc0f2cfa7e98551f705e3f774280f655b7 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Tue, 7 May 2024 14:08:06 +0200 Subject: [PATCH 1/2] tools/fedora-worker-packer: increase timeout waiting for packit --- tools/appsre-build-fedora-worker-packer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/appsre-build-fedora-worker-packer.sh b/tools/appsre-build-fedora-worker-packer.sh index 4dfeeeddf5..bac2fbb496 100755 --- a/tools/appsre-build-fedora-worker-packer.sh +++ b/tools/appsre-build-fedora-worker-packer.sh @@ -11,8 +11,8 @@ export SKIP_TAGS="rpmrepo_composer,rpmcopy,subscribe" FEDORA=fedora-38 export PACKER_ONLY_EXCEPT=--only=amazon-ebs."$FEDORA"-x86_64,amazon-ebs."$FEDORA"-aarch64 -# wait up to 10 minutes for the packit-as-a-service app (app id being 29076) -for RETRY in {1..11}; do +# wait up to 30 minutes for the packit-as-a-service app (app id being 29076) +for RETRY in {1..31}; do if [ "$RETRY" = 11 ]; then echo Waiting for the packit-as-a-service suite failed after 10 minutes exit 1 From 769bcac104812f5f5d90366338c6ad03b86c01c4 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Tue, 7 May 2024 14:38:45 +0200 Subject: [PATCH 2/2] tools/fedora-worker-packer: set the commit sha Currently the COMMIT_SHA variable is empty. --- tools/appsre-build-fedora-worker-packer.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/appsre-build-fedora-worker-packer.sh b/tools/appsre-build-fedora-worker-packer.sh index bac2fbb496..c34f539e52 100755 --- a/tools/appsre-build-fedora-worker-packer.sh +++ b/tools/appsre-build-fedora-worker-packer.sh @@ -10,6 +10,7 @@ export BUILD_RPMS=false export SKIP_TAGS="rpmrepo_composer,rpmcopy,subscribe" FEDORA=fedora-38 export PACKER_ONLY_EXCEPT=--only=amazon-ebs."$FEDORA"-x86_64,amazon-ebs."$FEDORA"-aarch64 +COMMIT_SHA="${COMMIT_SHA:-$(git rev-parse HEAD)}" # wait up to 30 minutes for the packit-as-a-service app (app id being 29076) for RETRY in {1..31}; do