Merge pull request #4013 from edx/nadeem/upgrade-gocd

upgrade GoCD

playbooks/roles/go-server/defaults/main.yml

@@ -13,16 +13,13 @@
 GO_SERVER_SERVICE_NAME: "go-server"
 GO_SERVER_USER: "go"
 GO_SERVER_GROUP: "{{ GO_SERVER_USER }}"
-GO_SERVER_VERSION: "17.1.0-4511"
+GO_SERVER_VERSION: "17.7.0-5147"
 GO_SERVER_HOME: "/var/lib/go-server"
 GO_SERVER_CONF_HOME: "/etc/go"
 GO_SERVER_PLUGIN_DIR: "{{ GO_SERVER_HOME }}/plugins/external/"
 
-# Java version settings
-GO_SERVER_ORACLEJDK_VERSION: "8u65"
-GO_SERVER_ORACLEJDK_BASE: "jdk1.8.0_65"
-GO_SERVER_ORACLEJDK_BUILD: "b17"
-GO_SERVER_ORACLEJDK_LINK: "/usr/lib/jvm/java-8-oracle"
+#Openjdk PPA Apt source
+openjdk_apt_source: "ppa:openjdk-r/ppa"
 
 # java tuning
 GO_SERVER_JAVA_HOME: "{{ GO_SERVER_ORACLEJDK_LINK }}"
@@ -31,7 +28,7 @@ GO_SERVER_JAVA_HOME: "{{ GO_SERVER_ORACLEJDK_LINK }}"
 GO_SERVER_APT_SOURCE: "deb https://download.gocd.io /"
 GO_SERVER_APT_KEY_URL: "https://download.gocd.io/GOCD-GPG-KEY.asc"
 GO_SERVER_APT_NAME: "go-server"
-GO_SERVER_APT_PKGS: ["apache2-utils"]
+GO_SERVER_APT_PKGS: ["apache2-utils","openjdk-8-jdk"]
 
 # gocd-oauth-login
 GO_SERVER_OAUTH_LOGIN_VERSION: "1.2"

playbooks/roles/go-server/meta/main.yml

@@ -18,11 +18,3 @@
 #   my_role_var0: "foo"
 #   my_role_var1: "bar"
 # }
-
-dependencies:
-  - role: oraclejdk
-    tags: java
-    oraclejdk_version: "{{ GO_SERVER_ORACLEJDK_VERSION }}"
-    oraclejdk_base: "{{ GO_SERVER_ORACLEJDK_BASE }}"
-    oraclejdk_build: "{{ GO_SERVER_ORACLEJDK_BUILD }}"
-    oraclejdk_link: "{{ GO_SERVER_ORACLEJDK_LINK }}"

playbooks/roles/go-server/tasks/main.yml

@@ -40,10 +40,9 @@
     url: "{{ GO_SERVER_APT_KEY_URL }}"
     state: present
 
-- name: install go-server using apt-get
-  apt:
-    name: "{{ GO_SERVER_APT_NAME }}={{ GO_SERVER_VERSION }}"
-    update_cache: yes
+- name: install openjdk ppa repository
+  apt_repository:
+    repo: "{{ openjdk_apt_source }}"
     state: present
 
 - name: install other needed system packages
@@ -54,6 +53,12 @@
     cache_valid_time: 3600
   with_items: "{{ GO_SERVER_APT_PKGS }}"
 
+- name: install go-server using apt-get
+  apt:
+    name: "{{ GO_SERVER_APT_NAME }}={{ GO_SERVER_VERSION }}"
+    update_cache: yes
+    state: present
+
 - name: create go-server plugin directory
   file:
     path: "{{ GO_SERVER_PLUGIN_DIR }}"