summaryrefslogtreecommitdiffstats
path: root/docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2020-10-01 20:38:47 +0000
committerDave Wallace <dwallacelf@gmail.com>2020-10-13 14:47:24 +0000
commit2db30aa5a938494a710a89cab5943675c1143918 (patch)
treed3ca1be1cde343527e94dd57401215ef9ef4a69e /docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives
parentf491fbd3929c2fd6b0910214796d5c0f5056ea82 (diff)
Clean up vpp jenkins scripts & docker dir
- Remove docker/vpp Dockerfile definitions and colateral files for image now being build by https://gerrit.fd.io/r/c/ci-management/+/28022 - Remove opensuse support which has been elided from the vpp build in https://gerrit.fd.io/r/c/vpp/+/28999 - Remove unused scripts. - Output script name marker for all jjb scripts following LFIT practices. - Remove old/unused output from scripts. - Add logic to use vpp-ext-deps download cache in the executor images to speed up build jobs. - Add copyright notifcations to modified files without an existing copyright. - Make all vpp/docs jobs use '-{stream}-{os}-{executor}' suffix in their names. - Consolidate executor logging into setup_executor_env.sh and call it first for all jobs. Change-Id: I4ffb67ed476659f0127ca8c84f20a305d06149bf Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives')
-rw-r--r--docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives57
1 files changed, 0 insertions, 57 deletions
diff --git a/docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives b/docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives
deleted file mode 100644
index 8484a711b..000000000
--- a/docker/vpp/vpp-ubuntu20/files/lf-update-java-alternatives
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2018 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-
-# This script takes the java-version variable to set the proper alternative
-# for java, javac and java_sdk_openjdk for ubuntu or centos/fedora/redhat distros
-
-JAVA_ENV_FILE="/tmp/java.env"
-
-update-java-redhat() {
- if [[ "${SET_JDK_VERSION//[a-zA-Z]/}" = "11" ]]; then
- export JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
- else
- export JAVA_HOME="/usr/lib/jvm/java-1.${SET_JDK_VERSION//[a-zA-Z:-]/}.0-openjdk"
- fi
- sudo /usr/sbin/alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1
- sudo /usr/sbin/alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1
- sudo /usr/sbin/alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1
- sudo /usr/sbin/alternatives --set java "${JAVA_HOME}/bin/java"
- sudo /usr/sbin/alternatives --set javac "${JAVA_HOME}/bin/javac"
- sudo /usr/sbin/alternatives --set java_sdk_openjdk "${JAVA_HOME}"
- echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE"
-}
-
-update-java-ubuntu() {
- export JAVA_HOME="/usr/lib/jvm/java-${SET_JDK_VERSION//[a-zA-Z:-]/}-openjdk-amd64"
- sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1
- sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1
- sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1
- sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java"
- sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac"
- sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}"
- echo JAVA_HOME="$JAVA_HOME" > "$JAVA_ENV_FILE"
-}
-
-echo "---> Updating Java version"
-OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
-
-case "${OS}" in
- fedora|centos|redhat)
- echo "---> RedHat type system detected"
- update-java-redhat
- ;;
- ubuntu)
- echo "---> Ubuntu system detected"
- update-java-ubuntu
- ;;
-esac
-java -version
-echo JAVA_HOME="${JAVA_HOME}"