Skip to content

Commit e219c0a

Browse files
committed
Update packaging test script to support mutlijob builds
1 parent 8fab26a commit e219c0a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.ci/os.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# opensuse 15 has a missing dep for systemd
3+
# opensuse 15 has a missing dep for systemd
44

55
if which zypper > /dev/null ; then
66
sudo zypper install -y insserv-compat
@@ -31,21 +31,21 @@ cp -v .ci/init.gradle $HOME/.gradle/init.d
3131

3232
unset JAVA_HOME
3333

34-
if ! [ -e "/usr/bin/bats" ] ; then
34+
if ! [ -e "/usr/bin/bats" ] ; then
3535
git clone https://github.com/sstephenson/bats /tmp/bats
3636
sudo /tmp/bats/install.sh /usr
3737
fi
3838

3939

40-
if [ -f "/etc/os-release" ] ; then
40+
if [ -f "/etc/os-release" ] ; then
4141
cat /etc/os-release
4242
. /etc/os-release
43-
if [[ "$ID" == "debian" || "$ID_LIKE" == "debian" ]] ; then
43+
if [[ "$ID" == "debian" || "$ID_LIKE" == "debian" ]] ; then
4444
# FIXME: The base image should not have rpm installed
4545
sudo rm -Rf /usr/bin/rpm
46-
# Work around incorrect lintian version
47-
# https://github.com/elastic/elasticsearch/issues/48573
48-
if [ $VERSION_ID == 10 ] ; then
46+
# Work around incorrect lintian version
47+
# https://github.com/elastic/elasticsearch/issues/48573
48+
if [ $VERSION_ID == 10 ] ; then
4949
sudo apt-get install -y --allow-downgrades lintian=2.15.0
5050
fi
5151
fi
@@ -71,13 +71,13 @@ sudo chmod 0440 /etc/sudoers.d/elasticsearch_vars
7171
sudo rm -Rf /elasticsearch
7272
sudo mkdir -p /elasticsearch/qa/ && sudo chown jenkins /elasticsearch/qa/ && ln -s $PWD/qa/vagrant /elasticsearch/qa/
7373

74-
# sudo sets it's own PATH thus we use env to override that and call sudo annother time so we keep the secure root PATH
74+
# sudo sets it's own PATH thus we use env to override that and call sudo annother time so we keep the secure root PATH
7575
# run with --continue to run both bats and java tests even if one fails
7676
# be explicit about Gradle home dir so we use the same even with sudo
7777
sudo -E env \
7878
PATH=$BUILD_JAVA_HOME/bin:`sudo bash -c 'echo -n $PATH'` \
7979
RUNTIME_JAVA_HOME=`readlink -f -n $RUNTIME_JAVA_HOME` \
8080
--unset=JAVA_HOME \
8181
SYSTEM_JAVA_HOME=`readlink -f -n $RUNTIME_JAVA_HOME` \
82-
./gradlew -g $HOME/.gradle --scan --parallel $@ --continue destructivePackagingTest
82+
./gradlew -g $HOME/.gradle --scan --parallel --continue $@
8383

0 commit comments

Comments
 (0)