From 895b1d7b4f7276a339d4f705a6724a99bb516463 Mon Sep 17 00:00:00 2001 From: Mark Heiges Date: Thu, 20 Apr 2017 15:41:29 -0400 Subject: [PATCH] java and jenkins version updates --- puppet/Puppetfile.lock | 57 ------------------- .../production/hieradata/common.yaml | 8 +-- 2 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 puppet/Puppetfile.lock diff --git a/puppet/Puppetfile.lock b/puppet/Puppetfile.lock deleted file mode 100644 index 10edef0..0000000 --- a/puppet/Puppetfile.lock +++ /dev/null @@ -1,57 +0,0 @@ -FORGE - remote: https://forgeapi.puppetlabs.com - specs: - crayfishx-firewalld (3.1.4) - puppetlabs-stdlib (< 5.0.0, >= 4.2.0) - jlambert121-trusted_ca (1.1.0) - puppetlabs-stdlib (< 5.0.0, >= 3.2.0) - puppet-archive (1.1.2) - puppetlabs-stdlib (< 5.0.0, >= 4.2.0) - puppetlabs-java_ks (1.4.1) - puppetlabs-stdlib (4.12.0) - -GIT - remote: git@github.com:EuPathDB/puppet-ebrc_java.git - ref: master - sha: 5434fa8c13d2dc4987530b5d9e713f05b9d93841 - specs: - ebrc-ebrc_java (0.1.0) - -GIT - remote: git@github.com:EuPathDB/puppet-ebrc_jenkins.git - ref: master - sha: a31c44dc36dd8edd1235ee0e66f19fd37da6db01 - specs: - ebrc-ebrc_jenkins (0.1.0) - puppet-archive (>= 0) - -GIT - remote: git@github.com:EuPathDB/puppet-ebrc_yum_repo.git - ref: master - sha: 2e75a0de6b7e4da022a1a4de7ee5306b5fcc0a4d - specs: - ebrc-ebrc_yum_repo (0.1.0) - puppetlabs-stdlib (>= 1.0.0) - -PATH - remote: ./src/profiles - specs: - local-profiles (0.0.0) - crayfishx-firewalld (>= 0) - ebrc-ebrc_java (>= 0) - ebrc-ebrc_jenkins (>= 0) - ebrc-ebrc_yum_repo (>= 0) - jlambert121-trusted_ca (>= 0) - puppetlabs-stdlib (>= 0) - -DEPENDENCIES - crayfishx-firewalld (>= 0) - ebrc-ebrc_java (>= 0) - ebrc-ebrc_jenkins (>= 0) - ebrc-ebrc_yum_repo (>= 0) - jlambert121-trusted_ca (>= 0) - local-profiles (>= 0) - puppet-archive (>= 0) - puppetlabs-java_ks (>= 0) - puppetlabs-stdlib (>= 0) - diff --git a/puppet/environments/production/hieradata/common.yaml b/puppet/environments/production/hieradata/common.yaml index 5fcc8c8..f204a5e 100644 --- a/puppet/environments/production/hieradata/common.yaml +++ b/puppet/environments/production/hieradata/common.yaml @@ -2,16 +2,16 @@ ebrc_jenkins::user_home: /usr/local/home/jenkins ebrc_jenkins::instances: CI: - version: 1.638 + version: 2.46.1 http_port: 9181 jmx_port: 9120 ebrc_ca::cacert: apidb-ca-rsa.crt ebrc_java::java_home: /usr/java/jdk1.8.0_92 ebrc_java::packages: - - jdk1.8.0_92 -ebrc_java::java_home: /usr/java/jdk1.8.0_92 -ebrc_java::default_ver: /usr/java/jdk1.8.0_92 + - jdk1.8.0_112 +ebrc_java::java_home: /usr/java/jdk1.8.0_112 +ebrc_java::default_ver: /usr/java/jdk1.8.0_112 java_keystore_target: /etc/pki/tls/certs/cacerts java_keystore_passwd: graeo5locza