tools/build-worker-packer: skip rpmcopr for RHEL and on CI

Also skip both rpmrepo tasks on RHEL.
osbuild · May 6, 2024 · 4e10fa4 · 4e10fa4
1 parent 2c4c3a8
commit 4e10fa4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/tools/appsre-build-worker-packer.sh b/tools/appsre-build-worker-packer.sh
@@ -6,7 +6,8 @@ COMMIT_SHA="${COMMIT_SHA:-$(git rev-parse HEAD)}"
 COMMIT_BRANCH="${COMMIT_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}"
 SKIP_CREATE_AMI="${SKIP_CREATE_AMI:-false}"
 BUILD_RPMS="${BUILD_RPMS:-true}"
-SKIP_TAGS="${SKIP_TAGS:-rpmrepo}"
+# RHEL workers build their own rpms.
+SKIP_TAGS="${SKIP_TAGS:-rpmrepo_composer,rpmrepo_osbuild,rpmcopr}"
 # Build rhel only
 PACKER_ONLY_EXCEPT="${PACKER_ONLY_EXCEPT:---only=amazon-ebs.rhel-9-x86_64,amazon-ebs.rhel-9-aarch64}"
 

diff --git a/tools/ci-build-worker-packer.sh b/tools/ci-build-worker-packer.sh
@@ -7,7 +7,7 @@ COMMIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 SKIP_CREATE_AMI=false
 BUILD_RPMS=false
 # Use prebuilt rpms on CI
-SKIP_TAGS="rpmcopy,subscribe"
+SKIP_TAGS="rpmcopy,rpmcopr,subscribe"
 
 if [ -n "$CI_COMMIT_SHA" ]; then
     COMMIT_SHA="$CI_COMMIT_SHA"