From c7aad1b17de69a96d758f8106ff06698debecf1c Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Thu, 18 Jan 2024 13:06:42 +0100
Subject: [PATCH] tools/app-sre-build-worker-packer: split out the CI script

To add the fedora workers built from AppSRE's infrastructure, we need a
combination that wasn't possible with the current matrix based on the CI
environment (jenkins vs gitlab).
---
 .gitlab-ci.yml                      |  2 +-
 tools/appsre-build-worker-packer.sh | 56 +++++------------------------
 tools/ci-build-worker-packer.sh     | 34 ++++++++++++++++++
 3 files changed, 43 insertions(+), 49 deletions(-)
 create mode 100755 tools/ci-build-worker-packer.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bd94fa42..9c9ae510b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,7 +147,7 @@ Packer:
   rules:
     - if: '$CI_PIPELINE_SOURCE != "schedule"'
   script:
-    - tools/appsre-build-worker-packer.sh
+    - tools/ci-build-worker-packer.sh
   variables:
     RUNNER: aws/rhel-9.2-ga-x86_64
 
diff --git a/tools/appsre-build-worker-packer.sh b/tools/appsre-build-worker-packer.sh
index 90ef3e666..19fe7438e 100755
--- a/tools/appsre-build-worker-packer.sh
+++ b/tools/appsre-build-worker-packer.sh
@@ -2,40 +2,19 @@
 # AppSRE runs this script to build an ami and share it with an account
 set -exv
 
+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}"
+# Build rhel only
+PACKER_ONLY_EXCEPT="${PACKER_ONLY_EXCEPT:---only=amazon-ebs.rhel-9-x86_64,amazon-ebs.rhel-9-aarch64}"
 
-COMMIT_SHA=$(git rev-parse HEAD)
-COMMIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-ON_JENKINS=true
-SKIP_CREATE_AMI=false
-BUILD_RPMS=false
-
-# Use gitlab CI variables if available
-if [ -n "$CI_COMMIT_SHA" ]; then
-    ON_JENKINS=false
-    COMMIT_SHA="$CI_COMMIT_SHA"
-fi
-if [ -n "$CI_COMMIT_BRANCH" ]; then
-    COMMIT_BRANCH="$CI_COMMIT_BRANCH"
-elif [ -n "$GIT_BRANCH" ]; then
+if [ -n "$GIT_BRANCH" ]; then
     # Use jenkins CI variables if available
     COMMIT_BRANCH="${GIT_BRANCH#*/}"
 fi
 
-if [ "$ON_JENKINS" = false ]; then
-    # work around not working podman from 9.1 on a 9.0 image
-    # see https://bugzilla.redhat.com/show_bug.cgi?id=2143282
-    # TODO: Remove me when the bug is fixed or we switch to 9.1
-    sudo dnf remove -y python-unversioned-command
-    sudo dnf upgrade -y
-
-    sudo dnf install -y podman jq
-fi
-
-# skip creating AMIs on PRs to save a ton of resources
-if [[ $COMMIT_BRANCH == PR-* ]]; then
-    SKIP_CREATE_AMI=true
-fi
-
 # decide whether podman or docker should be used
 if which podman 2>/dev/null >&2; then
     CONTAINER_RUNTIME=podman
@@ -56,25 +35,6 @@ function cleanup {
 }
 trap cleanup EXIT
 
-# Use prebuilt rpms on CI
-SKIP_TAGS="rpmcopy,subscribe"
-if [ "$ON_JENKINS" = true ]; then
-    # Build RPMs when running on AppSRE's infra
-    BUILD_RPMS=true
-    SKIP_TAGS="rpmrepo"
-fi
-
-if [ "$ON_JENKINS" = true ]; then
-    # jenkins on main: build rhel only
-    PACKER_ONLY_EXCEPT=--only=amazon-ebs.rhel-9-x86_64,amazon-ebs.rhel-9-aarch64
-elif [ -n "$CI_COMMIT_BRANCH" ] && [ "$CI_COMMIT_BRANCH" == "main" ]; then
-    # Schutzbot on main: build all except rhel
-    PACKER_ONLY_EXCEPT=--except=amazon-ebs.rhel-9-x86_64,amazon-ebs.rhel-9-aarch64
-elif [ -n "$CI_COMMIT_BRANCH" ]; then
-    # Schutzbot but not main, build everything (use dummy except)
-    PACKER_ONLY_EXCEPT=--except=amazon-ebs.dummy
-fi
-
 # prepare ansible inventories
 function write_inventories {
     for item in templates/packer/ansible/inventory/*; do
diff --git a/tools/ci-build-worker-packer.sh b/tools/ci-build-worker-packer.sh
new file mode 100755
index 000000000..de6ea64a4
--- /dev/null
+++ b/tools/ci-build-worker-packer.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# AppSRE runs this script to build an ami and share it with an account
+set -exv
+
+COMMIT_SHA=$(git rev-parse HEAD)
+COMMIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+SKIP_CREATE_AMI=false
+BUILD_RPMS=false
+# Use prebuilt rpms on CI
+SKIP_TAGS="rpmcopy,subscribe"
+
+if [ -n "$CI_COMMIT_SHA" ]; then
+    COMMIT_SHA="$CI_COMMIT_SHA"
+fi
+
+if [ -n "$CI_COMMIT_BRANCH" ]; then
+    COMMIT_BRANCH="$CI_COMMIT_BRANCH"
+fi
+
+# skip creating AMIs on PRs to save a ton of resources
+if [[ $COMMIT_BRANCH == PR-* ]]; then
+    SKIP_CREATE_AMI=true
+fi
+
+if [ -n "$CI_COMMIT_BRANCH" ] && [ "$CI_COMMIT_BRANCH" == "main" ]; then
+    # Schutzbot on main: build all except rhel
+    PACKER_ONLY_EXCEPT=--except=amazon-ebs.rhel-9-x86_64,amazon-ebs.rhel-9-aarch64
+else
+    # Schutzbot but not main, build everything (use dummy except)
+    PACKER_ONLY_EXCEPT=--except=amazon-ebs.dummy
+fi
+
+export COMMIT_SHA COMMIT_BRANCH SKIP_CREATE_AMI BUILD_RPMS SKIP_TAGS PACKER_ONLY_EXCEPT
+tools/appsre-build-worker-packer.sh