Fix RPM box url

Fixing the box URL to change the correct variable. It also fixes the broken retry bash script. Signed-off-by: Sascha Grunert <[email protected]>
cri-o · Nov 3, 2023 · 5b80534 · 5b80534
1 parent d470fa0
commit 5b80534
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/obs.yml b/.github/workflows/obs.yml
@@ -53,6 +53,7 @@ jobs:
           echo "PROJECT_VERSION=$PROJECT_VERSION" >> "$GITHUB_OUTPUT"
           echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
       - run: scripts/github-job-wait
+        if: ${{ github.event_name != 'pull_request' }}
         env:
           COMMIT: ${{ steps.step.outputs.commit }}
           GH_TOKEN: ${{ github.token }}

diff --git a/scripts/helpers b/scripts/helpers
@@ -6,11 +6,12 @@ set -x
 retry_3() {
     for _ in 1 2 3; do
         if "$@"; then
-            break
+            return
         else
             sleep 1
         fi
     done
+    exit 1
 }
 
 curl_retry() {

diff --git a/test/rpm/Vagrantfile b/test/rpm/Vagrantfile
@@ -8,13 +8,13 @@ Vagrant.configure("2") do |config|
   cpus = 4
 
   config.vm.provider :virtualbox do |v|
-    config.vm.box_url = "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-virtualbox.box"
+    v.vm.box_url = "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-virtualbox.box"
     v.memory = memory
     v.cpus = cpus
   end
 
   config.vm.provider :libvirt do |v|
-    config.vm.box_url = "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-libvirt.box"
+    v.vm.box_url = "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-libvirt.box"
     v.memory = memory
     v.cpus = cpus
   end