Skip to content

Commit 99edb0e

Browse files
committed
Switch CI to Leap due to boo#1190670
1 parent 1578a0a commit 99edb0e

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.circleci/config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ version: 2.1
33
jobs:
44
unit:
55
docker:
6-
- image: registry.opensuse.org/opensuse/tumbleweed
6+
- image: registry.opensuse.org/opensuse/leap:15.3
77
steps:
88
- checkout
99
- run:
1010
command: |
11-
zypper -n in --no-recommends diffutils make python3 tar python3-black
11+
zypper -n ar https://download.opensuse.org/repositories/devel:/languages:/python:/backports/openSUSE_Leap_15.3 py
12+
zypper --gpg-auto-import-keys ref py
13+
zypper -n in --no-recommends diffutils make python3 tar python3-black python3-importlib-metadata
1214
- checkout
1315
- run: make test_regen_all
1416
- run: make test_python_style

t/docker/lib/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if [ "$METHOD" == rest ]; then
6666
openqa-client --host localhost /api/v1/obs_rsync/$prj/runs put
6767
else
6868
echo 111 > /opt/openqa-trigger-from-obs/$prj/.job_id
69-
su "$dbuser" -c "/opt/openqa-trigger-from-obs/script/rsync.sh $prj"
69+
su "$dbuser" -c "bash -x /opt/openqa-trigger-from-obs/script/rsync.sh $prj"
7070
fi
7171

7272
sleep 10

t/docker/script/openSUSE:Leap:15.2:Staging:A.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ set -x
1515
# make sure run did happen
1616
test -f /var/lib/openqa/factory/iso/openSUSE-Leap-15.2-Staging:A-Staging-DVD-x86_64-Build248.1-Media.iso
1717
test -f /opt/openqa-trigger-from-obs/openSUSE:Leap:15.2:Staging:A/.run_last/openqa.cmd.log
18+
grep -q 'scheduled_product_id => 1' /opt/openqa-trigger-from-obs/openSUSE:Leap:15.2:Staging:A/.run_last/openqa.cmd.log || cat /opt/openqa-trigger-from-obs/openSUSE:Leap:15.2:Staging:A/.run_last/*.cmd.log
19+
1820
grep -q 'scheduled_product_id => 1' /opt/openqa-trigger-from-obs/openSUSE:Leap:15.2:Staging:A/.run_last/openqa.cmd.log
1921

2022
[ "$METHOD" != rest ] || {

0 commit comments

Comments
 (0)