Skip to content

Commit 7c9662e

Browse files
committed
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]>
1 parent d470fa0 commit 7c9662e

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/obs.yml

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
echo "PROJECT_VERSION=$PROJECT_VERSION" >> "$GITHUB_OUTPUT"
5454
echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
5555
- run: scripts/github-job-wait
56+
if: ${{ github.event_name != 'pull_request' }}
5657
env:
5758
COMMIT: ${{ steps.step.outputs.commit }}
5859
GH_TOKEN: ${{ github.token }}

scripts/helpers

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ set -x
66
retry_3() {
77
for _ in 1 2 3; do
88
if "$@"; then
9-
break
9+
return
1010
else
1111
sleep 1
1212
fi
1313
done
14+
exit 1
1415
}
1516

1617
curl_retry() {

test/rpm/Vagrantfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ Vagrant.configure("2") do |config|
77
memory = 8192
88
cpus = 4
99

10-
config.vm.provider :virtualbox do |v|
11-
config.vm.box_url = "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-virtualbox.box"
10+
config.vm.provider :virtualbox do |v, override|
11+
override.vm.box_url = "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-virtualbox.box"
1212
v.memory = memory
1313
v.cpus = cpus
1414
end
1515

16-
config.vm.provider :libvirt do |v|
17-
config.vm.box_url = "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-libvirt.box"
16+
config.vm.provider :libvirt do |v, override|
17+
override.vm.box_url = "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-libvirt.box"
1818
v.memory = memory
1919
v.cpus = cpus
2020
end

0 commit comments

Comments
 (0)