Skip to content

Commit

Permalink
ansible: cleanup debian7 config (#3498)
Browse files Browse the repository at this point in the history
  • Loading branch information
targos authored Sep 24, 2023
1 parent 660f914 commit e3059d7
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 34 deletions.
1 change: 0 additions & 1 deletion ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

packages: {
'centos': 'java-11-openjdk-headless',
'debian7': 'openjdk-7-jre-headless',
'debian8': 'oracle-java8-installer',
'debian9': 'openjdk-8-jre-headless',
'debian10': 'openjdk-11-jre-headless',
Expand Down
4 changes: 0 additions & 4 deletions ansible/roles/jenkins-worker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,3 @@
- name: enable jenkins at startup - zos - part 3
when: os|startswith("zos")
shell: "sh {{ home }}/{{ server_user }}/rc_patch_apply.sh"

- name: install monit
when: os in needs_monit
include_tasks: monit.yml
24 changes: 0 additions & 24 deletions ansible/roles/jenkins-worker/tasks/monit.yml

This file was deleted.

5 changes: 0 additions & 5 deletions ansible/roles/jenkins-worker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

init: {
aix: ['aix72', 'aix73'],
debian: 'debian7',
freebsd: 'freebsd',
ibmi: 'ibmi73',
macos: 'macos',
Expand Down Expand Up @@ -60,10 +59,6 @@ jenkins_init: {
init_type: "{{ os|match_key(init, raise_error=False)|default(os|stripversion|match_key(init, raise_error=False)) }}"
jenkins: "{{ jenkins_init[init_type] }}"

needs_monit: [
'debian7',
]

# some os'es needs different paths to java. add them here.
java_path: {
'ibmi73': '/QOpenSys/pkgs/lib/jvm/openjdk-11/bin/java',
Expand Down

0 comments on commit e3059d7

Please sign in to comment.