Add adoptopenjdk to userland list #30

sravyamks · 2019-03-28T14:19:56Z

AdoptopenJDK is added to the userland build list for virtualization and masking.
once changes for Virtualization and Masking are pushed, java8 can safely be removed from the list.

Testing:
added adoptopenjdk-java8 as dependency in app-gate instead of oracle-java8 -> ran pre-push -> http://selfservice.jenkins.delphix.com/job/dlpx-app-gate/job/master/job/build-package/job/pre-push/412/

pre-push for linux-pkg with adoptopenjdk changes -> http://selfservice.jenkins.delphix.com/job/devops-gate/job/master/job/linux-pkg-build/job/master/job/userland/job/pre-push/8/

appliance-build-orchestrator-pre-push with S3 links from above runs -> http://selfservice.jenkins.delphix.com/job/devops-gate/job/master/job/appliance-build-orchestrator-pre-push/766/

… dcoa & dcod VMs - Delphix Engine

pzakha

Looking at the appliance-build-orchestrator logs, there's 2 versions of Java installed at that point, but that does seem to still work. That said, /usr/bin/java is used to launch the app-stack, and it is unclear at this point if this points to oracle Java or to adoptopenjdk Java.

There's a few more things that we should test before following through:

We will need to have a follow-up change in delphix-platform to change JAVA_HOME: https://github.com/delphix/delphix-platform/blob/master/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml#L261
We should modify masking to depend on adoptopenjdk instead of oracle in here https://gitlab.delphix.com/masking/dms-core-gate/blob/master/dist/build.gradle#L531

With those changes, we should redo another run of appliance-build-orchestrator and verify that oracle Java is not being installed anymore by logging on the created appliance.

pzakha · 2019-03-28T16:20:01Z

packages/adoptopenjdk/config.sh


 function prepare() {
-	logmust "$TOP/buildpkg.sh" make-jpkg
+	if [[ $(dpkg-query --show java-package) != *"delphix"* ]]; then


Note that the presence of *"delphix"* in the version string is only there because that's what $DEFAULT_REVISION contains, and that may be customized by a build.
Until we have #22 implemented, we unfortunately need to do some hacks to lay out package dependencies. In this case, we can check for something like -f "$TOP/packages/make-jpkg/tmp/artifacts/"*.deb to determine whether make-jpkg was built (and thus installed) successfully.

pzakha · 2019-03-28T16:43:08Z

packages/adoptopenjdk/config.sh

 }

 function fetch() {
 	logmust cd "$WORKDIR/"

 	local url="http://artifactory.delphix.com/artifactory"

-	wget -nv "$url/java-binaries/linux/jdk/8/$tarfile" -O "$tarfile"
+	logmust wget -nv "$url/java-binaries/linux/jdk/8/$tarfile" -O "$tarfile"
 }

 function build() {
 	logmust cd "$WORKDIR/"

 	env DEB_BUILD_OPTIONS=nostrip fakeroot make-jpkg "$tarfile" <<<y


Can you prepend a logmust here?

pzakha · 2019-03-28T17:23:47Z

Also, could you please run make check on the linux-pkg changes to make sure there is no style check issues?

sravyamks · 2019-03-29T14:14:31Z

Looking at the appliance-build-orchestrator logs, there's 2 versions of Java installed at that point, but that does seem to still work. That said, /usr/bin/java is used to launch the app-stack, and it is unclear at this point if this points to oracle Java or to adoptopenjdk Java.

There's a few more things that we should test before following through:

We will need to have a follow-up change in delphix-platform to change JAVA_HOME: https://github.com/delphix/delphix-platform/blob/master/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml#L261

We should modify masking to depend on adoptopenjdk instead of oracle in here https://gitlab.delphix.com/masking/dms-core-gate/blob/master/dist/build.gradle#L531

With those changes, we should redo another run of appliance-build-orchestrator and verify that oracle Java is not being installed anymore by logging on the created appliance.

Sure. Yes, Both oracleJDK and AdoptopenJDK are installed right now on the image created as i didnot do the changes for Masking for this build and it still needs OracleJDK. Also i verified that java -version points to AdoptopenJDK while JAVA_HOME was still Oracle which i guess will be fixed with change you mentioned for delphix-platform.

pzakha

Code LGTM, pending testing.

pzakha · 2019-04-01T16:24:26Z

packages/adoptopenjdk/config.sh

-		echo_bold "custom java-package not installed. Building package 'make-jpkg' first."
-		logmust "$TOP/buildpkg.sh" make-jpkg
-	fi
+	for file in "$TOP/packages/make-jpkg/tmp/artifacts/"*.deb


I think this code is a bit confusing as it relies on file being equal to the literal "$TOP"'/packages/make-jpkg/tmp/artifacts/*.deb' with the * in the name.
probably something like this would be easier to understand:

if ! ls "$TOP/packages/make-jpkg/tmp/artifacts/"*.deb >/dev/null 2>&1; then ... fi

sravyamks · 2019-04-01T17:59:32Z

Testing:

delphix-platform -
changes : delphix/delphix-platform#67

saml-app -
changes : http://reviews.delphix.com/r/48313/

app-gate -
changes : http://reviews.delphix.com/r/48310/
build : http://selfservice.jenkins.delphix.com/job/dlpx-app-gate/job/master/job/build-package/job/pre-push/447/

masking -
changes : http://reviews.delphix.com/r/48311/
build - http://selfservice.jenkins.delphix.com/job/dms-core-gate/job/master/job/build-package/job/pre-push/73/

linux-pkg -
build : http://selfservice.jenkins.delphix.com/job/devops-gate/job/master/job/linux-pkg-build/job/master/job/userland/job/pre-push/15/

appliance-build-orchestrator-pre-push : http://selfservice.jenkins.delphix.com/job/devops-gate/job/master/job/appliance-build-orchestrator-pre-push/806/

Test java version on a VM from image created (dlpx-sravya.meda-master) -

delphix@ip-10-110-226-192:~$ java -version
openjdk version "1.8.0_202"
OpenJDK Runtime Environment (AdoptOpenJDK)(build 1.8.0_202-b08)
OpenJDK 64-Bit Server VM (AdoptOpenJDK)(build 25.202-b08, mixed mode)
delphix@ip-10-110-226-192:~$ javac -version
javac 1.8.0_202
delphix@ip-10-110-226-192:~$ echo $JAVA_HOME
/usr/lib/jvm/adoptopenjdk-java8-jdk-amd64
delphix@ip-10-110-226-192:~$ cd /usr/lib/jvm/
delphix@ip-10-110-226-192:/usr/lib/jvm$ ls
adoptopenjdk-java8-jdk-amd64

sravyamks added 2 commits March 26, 2019 17:03

CP-2486 Engine: Get Linux-Debian-based OpenJDK 8 builds and put it on…

9e3a5ec

… dcoa & dcod VMs - Delphix Engine

CP-2486 Engine: Get Linux-Debian-based OpenJDK 8 builds and put it on…

51c48b4

… dcoa & dcod VMs - Delphix Engine

pzakha reviewed Mar 28, 2019

View reviewed changes

check make-jpkg

7a9cc05

pzakha approved these changes Apr 1, 2019

View reviewed changes

pzakha reviewed Apr 1, 2019

View reviewed changes

fix errors on make-check

10b99a6

sravyamks mentioned this pull request Apr 3, 2019

update JAVA_HOME to adoptopenjdk delphix/delphix-platform#67

Merged

rasantel approved these changes Apr 4, 2019

View reviewed changes

pzakha merged commit 9934bb5 into delphix:master Apr 26, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add adoptopenjdk to userland list #30

Add adoptopenjdk to userland list #30

sravyamks commented Mar 28, 2019

pzakha left a comment

pzakha Mar 28, 2019

pzakha Mar 28, 2019

pzakha commented Mar 28, 2019

sravyamks commented Mar 29, 2019

pzakha left a comment

pzakha Apr 1, 2019

sravyamks commented Apr 1, 2019 •

edited

Loading

Add adoptopenjdk to userland list #30

Add adoptopenjdk to userland list #30

Conversation

sravyamks commented Mar 28, 2019

pzakha left a comment

Choose a reason for hiding this comment

pzakha Mar 28, 2019

Choose a reason for hiding this comment

pzakha Mar 28, 2019

Choose a reason for hiding this comment

pzakha commented Mar 28, 2019

sravyamks commented Mar 29, 2019

pzakha left a comment

Choose a reason for hiding this comment

pzakha Apr 1, 2019

Choose a reason for hiding this comment

sravyamks commented Apr 1, 2019 • edited Loading

sravyamks commented Apr 1, 2019 •

edited

Loading