Skip to content
Snippets Groups Projects
Commit 969b7e52 authored by Markus Alexander Kuppe's avatar Markus Alexander Kuppe
Browse files

No longer install JDK from webupd8 which breaks every

time for a couple of days when Oracle puts out a new
update release.

This breaks support for Java Flight Recordings.

[Bug][Toolbox]
parent e50d571e
No related branches found
No related tags found
No related merge requests found
...@@ -278,21 +278,21 @@ public class CloudDistributedTLCJob extends Job { ...@@ -278,21 +278,21 @@ public class CloudDistributedTLCJob extends Job {
// Send remote TLC's stdout to local stdout (this throws a TransportException // Send remote TLC's stdout to local stdout (this throws a TransportException
// unless shutdown is postponed by a few minutes above). // unless shutdown is postponed by a few minutes above).
ByteStreams.copy(channel.getOutput(), System.out); ByteStreams.copy(channel.getOutput(), System.out);
if (doJfr) { // if (doJfr) {
// Get Java Flight Recording from remote machine and save if to a local file in // // Get Java Flight Recording from remote machine and save if to a local file in
// the current working directory. We call "cat" because sftclient#get fails with // // the current working directory. We call "cat" because sftclient#get fails with
// the old net.schmizz.sshj and an update to the newer com.hierynomus seems // // the old net.schmizz.sshj and an update to the newer com.hierynomus seems
// awful lot of work. // // awful lot of work.
channel = sshClient.execChannel("cat /mnt/tlc/tlc.jfr"); // channel = sshClient.execChannel("cat /mnt/tlc/tlc.jfr");
final InputStream output = channel.getOutput(); // final InputStream output = channel.getOutput();
final String cwd = Paths.get(".").toAbsolutePath().normalize().toString() + File.separator; // final String cwd = Paths.get(".").toAbsolutePath().normalize().toString() + File.separator;
final File jfr = new File(cwd + "tlc.jfr"); // final File jfr = new File(cwd + "tlc.jfr");
ByteStreams.copy(output, new FileOutputStream(jfr)); // ByteStreams.copy(output, new FileOutputStream(jfr));
if (jfr.length() == 0) { // if (jfr.length() == 0) {
System.err.println("Received empty Java Flight recording. Not creating tlc.jfr file"); // System.err.println("Received empty Java Flight recording. Not creating tlc.jfr file");
jfr.delete(); // jfr.delete();
} // }
} // }
// Finally close the ssh connection. // Finally close the ssh connection.
sshClient.disconnect(); sshClient.disconnect();
monitor.subTask("TLC model checker process finished"); monitor.subTask("TLC model checker process finished");
...@@ -547,8 +547,6 @@ public class CloudDistributedTLCJob extends Job { ...@@ -547,8 +547,6 @@ public class CloudDistributedTLCJob extends Job {
+ " && " + " && "
+ params.getHostnameSetup() + params.getHostnameSetup()
+ " && " + " && "
// Oracle Java 8
+ "add-apt-repository ppa:webupd8team/java -y && "
// Accept license before apt (dpkg) tries to present it to us (which fails due to 'noninteractive' mode below) // Accept license before apt (dpkg) tries to present it to us (which fails due to 'noninteractive' mode below)
// see http://stackoverflow.com/a/19391042 // see http://stackoverflow.com/a/19391042
+ "echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections && " + "echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections && "
...@@ -593,7 +591,7 @@ public class CloudDistributedTLCJob extends Job { ...@@ -593,7 +591,7 @@ public class CloudDistributedTLCJob extends Job {
// worker tla2tools.jar (strip spec) and // worker tla2tools.jar (strip spec) and
// unattended-upgrades makes sure the instance // unattended-upgrades makes sure the instance
// is up-to-date security-wise. // is up-to-date security-wise.
+ "apt-get install --no-install-recommends mdadm e2fsprogs screen zip unattended-upgrades oracle-java8-installer oracle-java8-set-default " + "apt-get install --no-install-recommends mdadm e2fsprogs screen zip unattended-upgrades "
+ params.getExtraPackages() + " -y" + params.getExtraPackages() + " -y"
+ " && " + " && "
// Delegate file system tuning to cloud specific code. // Delegate file system tuning to cloud specific code.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment