Skip to content

Commit

Permalink
Merge pull request #5173 from os-autoinst/fetchneedles
Browse files Browse the repository at this point in the history
Fix condition evaluation for skip variables
  • Loading branch information
mergify[bot] committed Jun 1, 2023
2 parents 7db8703 + d243f82 commit b5e148d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions script/openqa-bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ setup=/usr/share/openqa/script/configure-web-proxy
sed -i -e 's/#*.*method.*=.*$/method = Fake/' /etc/openqa/openqa.ini


if [ -n "$skip_suse_specifics" ] && ping -c1 download.suse.de. && (! rpm -q ca-certificates-suse) ; then
if [ -z "$skip_suse_specifics" ] && ping -c1 download.suse.de. && (! rpm -q ca-certificates-suse) ; then
# add internal CA if executed within suse network
if ! zypper info ca-certificates-suse | grep -q ':' ; then
# add suse ca repo if needed
Expand All @@ -72,7 +72,7 @@ if [ -n "$skip_suse_specifics" ] && ping -c1 download.suse.de. && (! rpm -q ca-c
fi

# fetch tests and needles
if [ -n "$skip_suse_tests" ]; then
if [ -z "$skip_suse_tests" ]; then
if ping -c1 gitlab.suse.de. ; then
# use faster local mirror if run from within SUSE network
export needles_giturl="https://gitlab.suse.de/openqa/os-autoinst-needles-opensuse-mirror.git"
Expand Down

0 comments on commit b5e148d

Please sign in to comment.