Skip to content

Commit e3059d7

Browse files
authored
ansible: cleanup debian7 config (#3498)
1 parent 660f914 commit e3059d7

File tree

4 files changed

+0
-34
lines changed

4 files changed

+0
-34
lines changed

ansible/roles/java-base/vars/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
packages: {
88
'centos': 'java-11-openjdk-headless',
9-
'debian7': 'openjdk-7-jre-headless',
109
'debian8': 'oracle-java8-installer',
1110
'debian9': 'openjdk-8-jre-headless',
1211
'debian10': 'openjdk-11-jre-headless',

ansible/roles/jenkins-worker/tasks/main.yml

-4
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,3 @@
339339
- name: enable jenkins at startup - zos - part 3
340340
when: os|startswith("zos")
341341
shell: "sh {{ home }}/{{ server_user }}/rc_patch_apply.sh"
342-
343-
- name: install monit
344-
when: os in needs_monit
345-
include_tasks: monit.yml

ansible/roles/jenkins-worker/tasks/monit.yml

-24
This file was deleted.

ansible/roles/jenkins-worker/vars/main.yml

-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
init: {
88
aix: ['aix72', 'aix73'],
9-
debian: 'debian7',
109
freebsd: 'freebsd',
1110
ibmi: 'ibmi73',
1211
macos: 'macos',
@@ -60,10 +59,6 @@ jenkins_init: {
6059
init_type: "{{ os|match_key(init, raise_error=False)|default(os|stripversion|match_key(init, raise_error=False)) }}"
6160
jenkins: "{{ jenkins_init[init_type] }}"
6261

63-
needs_monit: [
64-
'debian7',
65-
]
66-
6762
# some os'es needs different paths to java. add them here.
6863
java_path: {
6964
'ibmi73': '/QOpenSys/pkgs/lib/jvm/openjdk-11/bin/java',

0 commit comments

Comments
 (0)