Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INFRA-41; Migrate OracleJDK to OpenJDK installing in custom images #3680

Merged
merged 4 commits into from
Jan 12, 2017

Conversation

mshaposhnik
Copy link
Contributor

What does this PR do?

Migrate OracleJDK to OpenJDK installing in custom images

What issues does this PR fix or reference?

INFRA-41

Previous behavior

Oracle JDK was installed on agent images without Java

New behavior

OpenJDK is installed on agent images without Java

@mshaposhnik
Copy link
Contributor Author

@skabashnyuk @tolusha pls review

@codenvy-ci
Copy link

@tolusha
Copy link
Contributor

tolusha commented Jan 12, 2017

We also have to install java if existed java version is below 1.8

    java_version=$(${JAVA_HOME}/bin/java -version 2>&1 | sed 's/.* version "\\(.*\\)\\.\\(.*\\)\\..*"/\\1\\2/; 1q')		
    if [ "${java_version}" -lt "18" ]; then		
        downloadJava;		
    fi

@tolusha
Copy link
Contributor

tolusha commented Jan 12, 2017

A lot of duplicated code fragments:

if [ ${INSTALL_JDK} = true ]; then
         export JAVA_HOME=${CHE_DIR}/jdk1.8
         ln -s /usr/lib/jvm/java-1.8.0-openjdk $JAVA_HOME
    fi

Can we simplify that?

@mshaposhnik
Copy link
Contributor Author

@tolusha added version check and JAVA_HOME export. Link path can differ a bit, so leave it as-is per OS type.

@tolusha
Copy link
Contributor

tolusha commented Jan 12, 2017

Agree.
You've changed only one script but all agents (json files) have been changed.
Could you pls revert them?

@mshaposhnik
Copy link
Contributor Author

It's only license year.

@codenvy-ci
Copy link

@mshaposhnik mshaposhnik merged commit 2eb57f0 into master Jan 12, 2017
@mshaposhnik mshaposhnik deleted the INFRA-41 branch January 13, 2017 08:03
@slemeur slemeur added this to the 5.1.0 milestone Jan 18, 2017
@slemeur slemeur added the kind/task Internal things, technical debt, and to-do tasks to be performed. label Jan 18, 2017
@JamesDrummond JamesDrummond mentioned this pull request Jan 31, 2017
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/task Internal things, technical debt, and to-do tasks to be performed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants