Add helper script and rework dependencies

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

dependencies.yaml

@@ -11,9 +11,7 @@ dependencies:
   - name: OSC
     version: 1.3.1
     refPaths:
-      - path: scripts/obs
-        match: OSC_VERSION
-      - path: scripts/reconcile
+      - path: scripts/helpers
         match: OSC_VERSION
 
   - name: Fedora test image
@@ -46,6 +44,12 @@ dependencies:
       - path: .github/workflows/obs.yml
         match: '- debian:'
 
+  - name: AlmaLinux test container image
+    version: '9.2'
+    refPaths:
+      - path: .github/workflows/obs.yml
+        match: '- almalinux:'
+
   - name: qemu
     version: 7.2.0-1
     refPaths:

scripts/helpers

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+curl_retry() {
+    curl -sSfL --retry 5 --retry-delay 3 "$@"
+}
+
+install_osc() {
+    OSC_VERSION=1.3.1
+    curl_retry https://github.com/openSUSE/osc/archive/refs/tags/$OSC_VERSION.tar.gz -o- | tar xfz -
+    pushd osc-$OSC_VERSION
+    sudo ./setup.py build
+    sudo ./setup.py install
+    popd
+}

scripts/obs

@@ -25,15 +25,6 @@ setup_krel() {
     krel version
 }
 
-install_osc() {
-    OSC_VERSION=1.3.1
-    curl_retry https://github.com/openSUSE/osc/archive/refs/tags/$OSC_VERSION.tar.gz -o- | tar xfz -
-    pushd osc-$OSC_VERSION
-    sudo ./setup.py build
-    sudo ./setup.py install
-    popd
-}
-
 obs_stage() {
     if [[ "$COMMIT" != "" ]]; then
         # Patch the package metadata to download the latest commit

scripts/reconcile

@@ -1,20 +1,11 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-OBS_PASSWORD=${OBS_PASSWORD:-}
-
-curl_retry() {
-    curl -sSfL --retry 5 --retry-delay 3 "$@"
-}
+source "$(dirname "${BASH_SOURCE[0]}")"/helpers
 
-install_osc() {
-    OSC_VERSION=1.3.1
-    curl_retry https://github.com/openSUSE/osc/archive/refs/tags/$OSC_VERSION.tar.gz -o- | tar xfz -
-    pushd osc-$OSC_VERSION
-    sudo ./setup.py build
-    sudo ./setup.py install
-    popd
+OBS_PASSWORD=${OBS_PASSWORD:-}
 
+setup_osc() {
     printf "[general]\napiurl = https://api.opensuse.org\n[https://api.opensuse.org]\n" >~/.oscrc
     echo user=cri-o-release-bot >>~/.oscrc
     echo "pass=$OBS_PASSWORD" >>~/.oscrc
@@ -26,6 +17,7 @@ submit_workflow() {
 }
 
 install_osc
+setup_osc
 
 PACKAGES=$(osc se --package cri-o)
 PROJECT_PREFIX=isv:kubernetes:addons:cri-o

scripts/vars

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -euox pipefail
 
-curl_retry() {
-    curl -sSfL --retry 5 --retry-delay 3 "$@"
-}
+source "$(dirname "${BASH_SOURCE[0]}")"/helpers
 
 PROJECT_ROOT=isv:kubernetes:addons:cri-o
 CRIO_MAIN_BRANCH=main