From e3059d702f5155fbb59432ab1b5053b6458474d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Sun, 24 Sep 2023 14:43:52 +0200
Subject: [PATCH] ansible: cleanup debian7 config (#3498)

---
 ansible/roles/java-base/vars/main.yml        |  1 -
 ansible/roles/jenkins-worker/tasks/main.yml  |  4 ----
 ansible/roles/jenkins-worker/tasks/monit.yml | 24 --------------------
 ansible/roles/jenkins-worker/vars/main.yml   |  5 ----
 4 files changed, 34 deletions(-)
 delete mode 100644 ansible/roles/jenkins-worker/tasks/monit.yml

diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
index 35aa95ab0..9ee92411f 100644
--- a/ansible/roles/java-base/vars/main.yml
+++ b/ansible/roles/java-base/vars/main.yml
@@ -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',
diff --git a/ansible/roles/jenkins-worker/tasks/main.yml b/ansible/roles/jenkins-worker/tasks/main.yml
index e86f6d798..5a48743ed 100644
--- a/ansible/roles/jenkins-worker/tasks/main.yml
+++ b/ansible/roles/jenkins-worker/tasks/main.yml
@@ -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
diff --git a/ansible/roles/jenkins-worker/tasks/monit.yml b/ansible/roles/jenkins-worker/tasks/monit.yml
deleted file mode 100644
index 2f0ce0fb0..000000000
--- a/ansible/roles/jenkins-worker/tasks/monit.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-
-#
-# installs and starts monit
-#
-
-- name: install monit
-  package: name=monit state=present
-
-- name: add monit config
-  copy:
-  args:
-    src: "{{ monitrc }}"
-    dest: "/etc/monitrc"
-    mode: 0440
-  loop_control:
-    loop_var: monitrc
-  with_first_found:
-    - files:
-        - "{{ role_path }}/files/{{ os }}.monitrc"
-        - "{{ role_path }}/files/{{ os|stripversion }}.monitrc"
-
-- name: start monit on boot
-  service: name=monit enabled=yes state=started
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
index ebbb8eb68..cce53559f 100644
--- a/ansible/roles/jenkins-worker/vars/main.yml
+++ b/ansible/roles/jenkins-worker/vars/main.yml
@@ -6,7 +6,6 @@
 
 init: {
   aix: ['aix72', 'aix73'],
-  debian: 'debian7',
   freebsd: 'freebsd',
   ibmi: 'ibmi73',
   macos: 'macos',
@@ -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',