From 443ad66bd1abf0628aa1d58a4103e3e1aa14fb43 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Sat, 18 Apr 2020 07:52:54 +0200 Subject: [PATCH 01/17] Java 11 build Signed-off-by: Sergii Kabashniuk --- .../assembly-che-tomcat8/src/assembly/bin/setenv.sh | 12 +++++++++++- dockerfiles/che/Dockerfile | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh b/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh index de22382955d..9fd58d389de 100644 --- a/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh +++ b/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh @@ -14,7 +14,17 @@ [ -z "${CHE_LOCAL_CONF_DIR}" ] && CHE_LOCAL_CONF_DIR="${CATALINA_HOME}/conf/" #Global JAVA options -[ -z "${JAVA_OPTS}" ] && JAVA_OPTS="-Xms256m -Xmx2048m -Djava.security.egd=file:/dev/./urandom" +[ -z "${JAVA_OPTS}" ] && JAVA_OPTS="-XX:MinRAMPercentage=60.0 -XX:MaxRAMPercentage=90.0 -Djava.security.egd=file:/dev/./urandom" +# Check compatible JAVA_OPTS +JAVA_VERSION=$(java -version 2>&1 | head -n 1 | cut -d'"' -f2 | cut -d'.' -f1 | sed 's/[^0-9]*//g') +if ([ "$JAVA_VERSION" -ge 11 ]) +then + echo "Incompatible JAVA_OPTS configured to use with Java 11. Reset to default" + echo $JAVA_OPTS + JAVA_OPTS="-XX:MinRAMPercentage=60.0 -XX:MaxRAMPercentage=90.0 -Djava.security.egd=file:/dev/./urandom" +else + echo "Sorry. Not found." +fi #Global LOGS DIR [ -z "${CHE_LOGS_DIR}" ] && CHE_LOGS_DIR="$CATALINA_HOME/logs" diff --git a/dockerfiles/che/Dockerfile b/dockerfiles/che/Dockerfile index e0647c1f041..ed7bcacbbb0 100644 --- a/dockerfiles/che/Dockerfile +++ b/dockerfiles/che/Dockerfile @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: EPL-2.0 # -FROM openjdk:8u242-jre-slim +FROM openjdk:11-jre-slim ENV LANG=C.UTF-8 RUN echo "%root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && rm -rf /tmp/* EXPOSE 8000 8080 From 92fb96a694f77af6e5e0e4d43761229125d456ba Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Sat, 18 Apr 2020 11:18:32 +0200 Subject: [PATCH 02/17] cleanup setenv Signed-off-by: Sergii Kabashniuk --- assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh b/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh index 9fd58d389de..96373aea59f 100644 --- a/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh +++ b/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh @@ -19,11 +19,8 @@ JAVA_VERSION=$(java -version 2>&1 | head -n 1 | cut -d'"' -f2 | cut -d'.' -f1 | sed 's/[^0-9]*//g') if ([ "$JAVA_VERSION" -ge 11 ]) then - echo "Incompatible JAVA_OPTS configured to use with Java 11. Reset to default" - echo $JAVA_OPTS - JAVA_OPTS="-XX:MinRAMPercentage=60.0 -XX:MaxRAMPercentage=90.0 -Djava.security.egd=file:/dev/./urandom" -else - echo "Sorry. Not found." + echo "Sanitizing JAVA_OPTS" + JAVA_OPTS=$(echo "$JAVA_OPTS" | sed "s/-XX:+UseCGroupMemoryLimitForHeap//") fi #Global LOGS DIR From 4687a8106564232d49b57ec22ca2fe7b25f8afa2 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Tue, 21 Apr 2020 17:02:19 +0200 Subject: [PATCH 03/17] Set correct java11 artifact name for ci Signed-off-by: Sergii Kabashniuk --- .ci/cico_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/cico_common.sh b/.ci/cico_common.sh index 1d7ad8c5ae9..de7d146fec6 100644 --- a/.ci/cico_common.sh +++ b/.ci/cico_common.sh @@ -60,7 +60,7 @@ load_mvn_settings_gpg_key() { install_deps(){ set +x yum -y update - yum -y install centos-release-scl-rh java-1.8.0-openjdk-devel git + yum -y install centos-release-scl-rh java-11-openjdk-devel git yum -y install rh-maven33 yum install -y yum-utils device-mapper-persistent-data lvm2 yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo From bc50d3b75900331bb3e77a291e32a6d05b261031 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Sun, 3 May 2020 09:51:23 +0200 Subject: [PATCH 04/17] set everrest version Signed-off-by: Sergii Kabashniuk --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 818cf7b36ea..8cff702ce04 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 2.7.5 2.2.0 0.3.0 - 1.13.5 + 1.14.4 4.2.0 1.3 1.0.13.Final From 7ef2e34b5a1d41c6a24415f7676b301e59bba502 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Sun, 3 May 2020 09:54:16 +0200 Subject: [PATCH 05/17] set default java opts Signed-off-by: Sergii Kabashniuk --- assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh b/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh index 96373aea59f..898cdb0005e 100644 --- a/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh +++ b/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh @@ -14,14 +14,7 @@ [ -z "${CHE_LOCAL_CONF_DIR}" ] && CHE_LOCAL_CONF_DIR="${CATALINA_HOME}/conf/" #Global JAVA options -[ -z "${JAVA_OPTS}" ] && JAVA_OPTS="-XX:MinRAMPercentage=60.0 -XX:MaxRAMPercentage=90.0 -Djava.security.egd=file:/dev/./urandom" -# Check compatible JAVA_OPTS -JAVA_VERSION=$(java -version 2>&1 | head -n 1 | cut -d'"' -f2 | cut -d'.' -f1 | sed 's/[^0-9]*//g') -if ([ "$JAVA_VERSION" -ge 11 ]) -then - echo "Sanitizing JAVA_OPTS" - JAVA_OPTS=$(echo "$JAVA_OPTS" | sed "s/-XX:+UseCGroupMemoryLimitForHeap//") -fi +[ -z "${JAVA_OPTS}" ] && JAVA_OPTS="-XX:MaxRAMPercentage=85.0 -Djava.security.egd=file:/dev/./urandom" #Global LOGS DIR [ -z "${CHE_LOGS_DIR}" ] && CHE_LOGS_DIR="$CATALINA_HOME/logs" From ad102a20499795bcccd83b4a0a610bd8c1c77f14 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Sun, 3 May 2020 16:27:45 +0200 Subject: [PATCH 06/17] Setup alpine based java 11 Dockerfile Signed-off-by: Sergii Kabashniuk --- dockerfiles/che/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dockerfiles/che/Dockerfile b/dockerfiles/che/Dockerfile index ed7bcacbbb0..ab190e25d4d 100644 --- a/dockerfiles/che/Dockerfile +++ b/dockerfiles/che/Dockerfile @@ -5,8 +5,10 @@ # # SPDX-License-Identifier: EPL-2.0 # -FROM openjdk:11-jre-slim +FROM alpine:3.11 +RUN apk --no-cache add "openjdk11-jre=11.0.5_p10-r0" bash ENV LANG=C.UTF-8 +ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk RUN echo "%root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && rm -rf /tmp/* EXPOSE 8000 8080 COPY entrypoint.sh /entrypoint.sh From 3498cc3ceb8b5f9eb251ab076ce531e1dcde04af Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Sun, 3 May 2020 17:51:46 +0200 Subject: [PATCH 07/17] Fix: [InjectOnMemberAndConstructor] Members shouldn't be annotated with @Inject if constructor is already annotated @Inject Signed-off-by: Sergii Kabashniuk --- .../java/org/eclipse/che/selenium/pageobject/git/GitReset.java | 2 +- .../factory/server/github/GithubFactoryParametersResolver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java b/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java index 372d6950b35..b79ae6d5ea0 100644 --- a/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java +++ b/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java @@ -23,7 +23,7 @@ /** @author Andrey Chizhikov */ @Singleton public class GitReset { - @Inject SeleniumWebDriverHelper seleniumWebDriverHelper; + SeleniumWebDriverHelper seleniumWebDriverHelper; interface Locators { String RESET_TO_COMMIT_FORM = "gwt-debug-git-reset-window"; diff --git a/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubFactoryParametersResolver.java b/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubFactoryParametersResolver.java index 7db755b18c7..e3849a14e3c 100644 --- a/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubFactoryParametersResolver.java +++ b/wsmaster/che-core-api-factory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubFactoryParametersResolver.java @@ -46,7 +46,7 @@ public class GithubFactoryParametersResolver extends DefaultFactoryParameterReso private GithubSourceStorageBuilder githubSourceStorageBuilder; /** ProjectDtoMerger */ - @Inject private ProjectConfigDtoMerger projectConfigDtoMerger; + private ProjectConfigDtoMerger projectConfigDtoMerger; @Inject public GithubFactoryParametersResolver( From a1e83a80fffd0682d0495ae378ee87a23c21373f Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Mon, 11 May 2020 14:08:14 +0200 Subject: [PATCH 08/17] Lineup JAVA_OPTS with che-operator Signed-off-by: Sergii Kabashniuk --- assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh | 2 +- deploy/kubernetes/helm/che/templates/configmap.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh b/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh index 898cdb0005e..ae9aa06d9a5 100644 --- a/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh +++ b/assembly/assembly-che-tomcat8/src/assembly/bin/setenv.sh @@ -14,7 +14,7 @@ [ -z "${CHE_LOCAL_CONF_DIR}" ] && CHE_LOCAL_CONF_DIR="${CATALINA_HOME}/conf/" #Global JAVA options -[ -z "${JAVA_OPTS}" ] && JAVA_OPTS="-XX:MaxRAMPercentage=85.0 -Djava.security.egd=file:/dev/./urandom" +[ -z "${JAVA_OPTS}" ] && JAVA_OPTS="-XX:MaxRAMPercentage=85.0 " #Global LOGS DIR [ -z "${CHE_LOGS_DIR}" ] && CHE_LOGS_DIR="$CATALINA_HOME/logs" diff --git a/deploy/kubernetes/helm/che/templates/configmap.yaml b/deploy/kubernetes/helm/che/templates/configmap.yaml index cf856d5e5f1..234cb1be699 100644 --- a/deploy/kubernetes/helm/che/templates/configmap.yaml +++ b/deploy/kubernetes/helm/che/templates/configmap.yaml @@ -72,7 +72,7 @@ data: CHE_OAUTH_OPENSHIFT_CLIENTSECRET: {{ .Values.global.openShiftClientSecret | quote}} CHE_OAUTH_OPENSHIFT_OAUTH__ENDPOINT: {{ .Values.global.openShiftOAuthEndpoint | quote}} CHE_OAUTH_OPENSHIFT_VERIFY__TOKEN__URL: {{ .Values.global.openShiftVerifyTokenUrl | quote}} - JAVA_OPTS: "-XX:MaxRAMFraction=2 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dsun.zip.disableMemoryMapping=true -Xms20m " + JAVA_OPTS: "-XX:MaxRAMPercentage=85.0 " CHE_WORKSPACE_AUTO_START: "false" {{- if .Values.global.tls.enabled }} CHE_INFRA_KUBERNETES_INGRESS_ANNOTATIONS__JSON: '{"kubernetes.io/ingress.class": "nginx", "kubernetes.io/tls-acme": "true", "{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/rewrite-target": "/$1","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/ssl-redirect": "true","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-connect-timeout": "3600","{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout": "3600"}' From 0d2229a545b050ecb4565082b689b259d8a7e166 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Mon, 11 May 2020 14:12:11 +0200 Subject: [PATCH 09/17] Reverted to debian based image because of SSLHandshakeException in jgroups communication with k8s Signed-off-by: Sergii Kabashniuk --- dockerfiles/che/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dockerfiles/che/Dockerfile b/dockerfiles/che/Dockerfile index ab190e25d4d..344bfa66f0e 100644 --- a/dockerfiles/che/Dockerfile +++ b/dockerfiles/che/Dockerfile @@ -1,3 +1,4 @@ + # Copyright (c) 2012-2019 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 @@ -5,10 +6,8 @@ # # SPDX-License-Identifier: EPL-2.0 # -FROM alpine:3.11 -RUN apk --no-cache add "openjdk11-jre=11.0.5_p10-r0" bash +FROM openjdk:11-jre-slim ENV LANG=C.UTF-8 -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk RUN echo "%root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && rm -rf /tmp/* EXPOSE 8000 8080 COPY entrypoint.sh /entrypoint.sh From d04140256d9e71363483241214abf423c967f94f Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Mon, 11 May 2020 14:16:11 +0200 Subject: [PATCH 10/17] Cleanup Signed-off-by: Sergii Kabashniuk --- dockerfiles/che/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dockerfiles/che/Dockerfile b/dockerfiles/che/Dockerfile index 344bfa66f0e..ed7bcacbbb0 100644 --- a/dockerfiles/che/Dockerfile +++ b/dockerfiles/che/Dockerfile @@ -1,4 +1,3 @@ - # Copyright (c) 2012-2019 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 From 256083251e414e52cf884ef932682689f3d1c65f Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Mon, 15 Jun 2020 19:33:54 +0200 Subject: [PATCH 11/17] Setup maven from Apache servers Signed-off-by: Sergii Kabashniuk --- .ci/cico_common.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.ci/cico_common.sh b/.ci/cico_common.sh index d81a100e1f1..714df391b09 100644 --- a/.ci/cico_common.sh +++ b/.ci/cico_common.sh @@ -59,9 +59,12 @@ load_mvn_settings_gpg_key() { install_deps(){ set +x - yum -y update - yum -y install centos-release-scl-rh java-11-openjdk-devel git - yum -y install rh-maven33 + yum -y update && yum -y install java-11-openjdk-devel git + mkdir -p /opt/apache-maven && curl -sSL https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | tar -xz --strip=1 -C /opt/apache-maven + export JAVA_HOME=/usr/lib/jvm/java-11-openjdk + export PATH="/usr/lib/jvm/java-11-openjdk:/opt/apache-maven/bin:/usr/bin:${PATH:-/bin:/usr/bin}" + export JAVACONFDIRS="/etc/java${JAVACONFDIRS:+:}${JAVACONFDIRS:-}" + export M2_HOME="/opt/apache-maven" yum install -y yum-utils device-mapper-persistent-data lvm2 yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo curl -sL https://rpm.nodesource.com/setup_10.x | bash - @@ -73,9 +76,9 @@ install_deps(){ mvn_build() { set -x if [[ $DO_NOT_IGNORE_TESTS == "true" ]]; then - scl enable rh-maven33 'mvn clean install -U -Pintegration -Dmaven.test.failure.ignore=false' + mvn clean install -U -Pintegration -Dmaven.test.failure.ignore=false else - scl enable rh-maven33 'mvn clean install -U -Pintegration' + mvn clean install -U -Pintegration fi if [[ $? -eq 0 ]]; then echo 'Build Success!' From b703a2e4581fcc541cfc9bceada68ebb00c8897b Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Mon, 15 Jun 2020 20:34:40 +0200 Subject: [PATCH 12/17] fixup! Setup maven from Apache servers Signed-off-by: Sergii Kabashniuk --- .ci/cico_common.sh | 10 +++++----- tests/.infra/centos-ci/functional_tests_utils.sh | 10 ++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.ci/cico_common.sh b/.ci/cico_common.sh index 714df391b09..a239ddac20c 100644 --- a/.ci/cico_common.sh +++ b/.ci/cico_common.sh @@ -18,7 +18,7 @@ function die_with() { } function getCurrentVersion() { - echo $(scl enable rh-maven33 "mvn help:evaluate -Dexpression=project.version -q -DforceStdout") + echo $(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) } function getReleaseVersion() { @@ -26,7 +26,7 @@ function getReleaseVersion() { } function setReleaseVersionInMavenProject(){ - scl enable rh-maven33 "mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1" + mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1 } load_jenkins_vars() { @@ -90,7 +90,7 @@ mvn_build() { mvn_deploy() { set -x echo 'Going to deploy artifacts' - scl enable rh-maven33 "mvn clean deploy -DcreateChecksum=true -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE" + mvn clean deploy -DcreateChecksum=true -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE if [[ $? -eq 0 ]]; then echo 'Deploy Success!' else @@ -200,11 +200,11 @@ releaseProject() { echo "Release version ${tag}" setReleaseVersionInMavenProject ${tag} git commit -asm "Release version ${tag}" - scl enable rh-maven33 'mvn clean install -U -DskipTests=true -Dskip-validate-sources' + mvn clean install -U -DskipTests=true -Dskip-validate-sources if [[ $? -eq 0 ]]; then echo 'Build Success!' echo 'Going to deploy artifacts' - scl enable rh-maven33 "mvn clean deploy -Pcodenvy-release -DcreateChecksum=true -DskipTests=true -Dskip-validate-sources -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE -Darchetype.test.skip=true -Dversion.animal-sniffer.enforcer-rule=1.16" + mvn clean deploy -Pcodenvy-release -DcreateChecksum=true -DskipTests=true -Dskip-validate-sources -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE -Darchetype.test.skip=true -Dversion.animal-sniffer.enforcer-rule=1.16 else die_with 'Build Failed!' fi diff --git a/tests/.infra/centos-ci/functional_tests_utils.sh b/tests/.infra/centos-ci/functional_tests_utils.sh index 9385309494c..75be6422b0f 100755 --- a/tests/.infra/centos-ci/functional_tests_utils.sh +++ b/tests/.infra/centos-ci/functional_tests_utils.sh @@ -7,7 +7,7 @@ # http://www.eclipse.org/legal/epl-v10.html buildAndDeployArtifacts() { - scl enable rh-maven33 'mvn clean install -U -Pintegration' + mvn clean install -U -Pintegration if [[ $? -eq 0 ]]; then echo 'Build Success!' echo 'Going to deploy artifacts' @@ -128,8 +128,11 @@ function installStartDocker() { } function installMvn() { - yum install --assumeyes -d1 centos-release-scl - yum install --assumeyes -d1 rh-maven33 + mkdir -p /opt/apache-maven && curl -sSL https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | tar -xz --strip=1 -C /opt/apache-maven + export JAVA_HOME=/usr/lib/jvm/java-11-openjdk + export PATH="/usr/lib/jvm/java-11-openjdk:/opt/apache-maven/bin:/usr/bin:${PATH:-/bin:/usr/bin}" + export JAVACONFDIRS="/etc/java${JAVACONFDIRS:+:}${JAVACONFDIRS:-}" + export M2_HOME="/opt/apache-maven" } function installNodejs() { @@ -383,7 +386,6 @@ function setupEnvs() { QUAY_ECLIPSE_CHE_USERNAME \ QUAY_ECLIPSE_CHE_PASSWORD)" - export PATH=$PATH:/opt/rh/rh-maven33/root/bin } function configureGithubTestUser() { From f945c18d4ec4ec34f1235ce3a6344fcbf171709c Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Mon, 15 Jun 2020 21:19:26 +0200 Subject: [PATCH 13/17] fixup! fixup! Setup maven from Apache servers Signed-off-by: Sergii Kabashniuk --- tests/.infra/centos-ci/functional_tests_utils.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/.infra/centos-ci/functional_tests_utils.sh b/tests/.infra/centos-ci/functional_tests_utils.sh index 75be6422b0f..fc9477d24f1 100755 --- a/tests/.infra/centos-ci/functional_tests_utils.sh +++ b/tests/.infra/centos-ci/functional_tests_utils.sh @@ -175,8 +175,7 @@ function installDependencies() { bzip2 \ golang \ make \ - java-1.8.0-openjdk \ - java-1.8.0-openjdk-devel + java-11-openjdk-devel installMvn installNodejs insalllYarn From 8939804ee25cb69ac02a96aa647fb365111c6496 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Tue, 16 Jun 2020 10:40:41 +0200 Subject: [PATCH 14/17] fixup! fixup! fixup! Setup maven from Apache servers Signed-off-by: Sergii Kabashniuk --- tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile index 5f2fe21b864..c4ac1e1db43 100644 --- a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile +++ b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { } environment { - PATH = "/tmp:/qa/tools/opt/apache-maven-3.5.4/bin:$PATH" + PATH = "/tmp:/qa/tools/opt/apache-maven-3.6.3/bin:$PATH" JENKINS_BUILD = "true" DEVFILE_PATH = "${WORKSPACE}/test-workspace-devfile.yaml" From c883d4c72c095b8d9b1fbb571b09e6125150942c Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Tue, 16 Jun 2020 11:19:53 +0200 Subject: [PATCH 15/17] fixup! fixup! fixup! fixup! Setup maven from Apache servers Signed-off-by: Sergii Kabashniuk --- tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile index c4ac1e1db43..7839edf7b19 100644 --- a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile +++ b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { } environment { - PATH = "/tmp:/qa/tools/opt/apache-maven-3.6.3/bin:$PATH" + PATH = "/tmp:/qa/tools/opt/apache-maven-3.6.1/bin:$PATH" JENKINS_BUILD = "true" DEVFILE_PATH = "${WORKSPACE}/test-workspace-devfile.yaml" From e9042a51d6a1d0199fca52b56113c1884127d2ad Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Tue, 16 Jun 2020 13:35:07 +0200 Subject: [PATCH 16/17] fixup! fixup! fixup! fixup! fixup! Setup maven from Apache servers Signed-off-by: Sergii Kabashniuk --- tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile index 7839edf7b19..ce4dbc3b659 100644 --- a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile +++ b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile @@ -11,7 +11,8 @@ pipeline { } environment { - PATH = "/tmp:/qa/tools/opt/apache-maven-3.6.1/bin:$PATH" + PATH = "/tmp:/qa/tools/opt/apache-maven-3.6.1/bin:/qa/tools/opt/openjdk-11.0.6.10/bin:$PATH" + JAVA_HOME="/qa/tools/opt/openjdk-11.0.6.10" JENKINS_BUILD = "true" DEVFILE_PATH = "${WORKSPACE}/test-workspace-devfile.yaml" From 567fa32f6311d801ad49899a4870af95e401cd33 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Tue, 16 Jun 2020 16:39:39 +0200 Subject: [PATCH 17/17] fixup! fixup! fixup! fixup! fixup! fixup! Setup maven from Apache servers Signed-off-by: Sergii Kabashniuk --- tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile index ce4dbc3b659..e3c0620bd3f 100644 --- a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile +++ b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile @@ -79,6 +79,7 @@ pipeline { } else { mutableCheImageTag = cheImageTag } + sh "sudo yum install -y glibc.i686 libfreetype.so.6 libfontconfig.so.1 libstdc++.so.6" } } }