1
1
#! /bin/bash
2
2
3
- # opensuse 15 has a missing dep for systemd
3
+ # opensuse 15 has a missing dep for systemd
4
4
5
5
if which zypper > /dev/null ; then
6
6
sudo zypper install -y insserv-compat
@@ -31,21 +31,21 @@ cp -v .ci/init.gradle $HOME/.gradle/init.d
31
31
32
32
unset JAVA_HOME
33
33
34
- if ! [ -e " /usr/bin/bats" ] ; then
34
+ if ! [ -e " /usr/bin/bats" ] ; then
35
35
git clone https://github.com/sstephenson/bats /tmp/bats
36
36
sudo /tmp/bats/install.sh /usr
37
37
fi
38
38
39
39
40
- if [ -f " /etc/os-release" ] ; then
40
+ if [ -f " /etc/os-release" ] ; then
41
41
cat /etc/os-release
42
42
. /etc/os-release
43
- if [[ " $ID " == " debian" || " $ID_LIKE " == " debian" ]] ; then
43
+ if [[ " $ID " == " debian" || " $ID_LIKE " == " debian" ]] ; then
44
44
# FIXME: The base image should not have rpm installed
45
45
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
49
49
sudo apt-get install -y --allow-downgrades lintian=2.15.0
50
50
fi
51
51
fi
@@ -71,13 +71,13 @@ sudo chmod 0440 /etc/sudoers.d/elasticsearch_vars
71
71
sudo rm -Rf /elasticsearch
72
72
sudo mkdir -p /elasticsearch/qa/ && sudo chown jenkins /elasticsearch/qa/ && ln -s $PWD /qa/vagrant /elasticsearch/qa/
73
73
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
75
75
# run with --continue to run both bats and java tests even if one fails
76
76
# be explicit about Gradle home dir so we use the same even with sudo
77
77
sudo -E env \
78
78
PATH=$BUILD_JAVA_HOME /bin:` sudo bash -c ' echo -n $PATH' ` \
79
79
RUNTIME_JAVA_HOME=` readlink -f -n $RUNTIME_JAVA_HOME ` \
80
80
--unset=JAVA_HOME \
81
81
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 $@
83
83
0 commit comments