fixup! ansible,jenkins: smartos18 in ci and ci-release

rvagg · rvagg · commit 436b080eff99 · 2019-04-18T17:03:26.000+10:00
diff --git a/ansible/roles/jenkins-worker/meta/main.yml b/ansible/roles/jenkins-worker/meta/main.yml
@@ -5,5 +5,4 @@
 #
 
 dependencies:
-- { 'role': 'java-base' }
 - { 'role': 'gcc', when: os|startswith("rhel7") }
diff --git a/ansible/roles/jenkins-worker/tasks/main.yml b/ansible/roles/jenkins-worker/tasks/main.yml
@@ -252,6 +252,11 @@
   when: os|startswith("zos")
   command: "chown -R {{ server_user }} {{ home }}/{{ server_user }}/gyp"
 
+# This has to be done before the `service` (and similar) commands because
+# java is needed to start the service
+- include_role:
+    name: java-base
+
 - name: enable jenkins at startup - general
   when: not os|startswith("zos") and not os|startswith("macos") and not os|startswith("aix")
   service: name=jenkins state=restarted enabled=yes
@@ -294,6 +299,3 @@
   when: os in needs_monit
   include: monit.yml
   static: false
-
-- include_role:
-    name: java-base

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,4 @@`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`dependencies:`
`8`		`-- { 'role': 'java-base' }`
`9`	`8`	`- { 'role': 'gcc', when: os\|startswith("rhel7") }`