Fix update-java-alternatives invocations and sudoers to match ONOS jenkins which works
Change-Id: I3c42403ecb31bb46a9a9e539511e7c3592b87275
diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index 3fe240f..5287127 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -63,7 +63,7 @@
#!/usr/bin/env bash
set -eu -o pipefail
echo "Setting JDK Distro to: $jdkDistro"
- sudo update-java-alternatives -set "$jdkDistro"
+ sudo update-java-alternatives -s $jdkDistro
echo "Java Version:"
java -version
@@ -128,7 +128,7 @@
#!/usr/bin/env bash
set -eu -o pipefail
echo "Setting JDK Distro to: $jdkDistro"
- sudo update-java-alternatives -set "$jdkDistro"
+ sudo update-java-alternatives -s $jdkDistro
echo "Java Version:"
java -version
@@ -197,7 +197,7 @@
#!/usr/bin/env bash
set -eu -o pipefail
echo "Setting JDK Distro to: $jdkDistro"
- sudo update-java-alternatives -set "$jdkDistro"
+ sudo update-java-alternatives -s $jdkDistro
echo "Java Version:"
java -version
diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index e95ad90..177e9b2 100644
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -186,9 +186,9 @@
# Allow jenkins access to update-alternatives command to switch java version
cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Cmnd_Alias UALTS = /usr/sbin/update-alternatives, /usr/sbin/update-java-alternatives
+Cmnd_Alias CMDS = /usr/sbin/update-alternatives, /usr/sbin/update-java-alternatives
Defaults:jenkins !requiretty
-jenkins ALL = NOPASSWD: UALTS
+jenkins ALL = NOPASSWD: CMDS
EOF
export DEBIAN_FRONTEND=noninteractive