Skip to content

Commit

Permalink
Fix CI errors
Browse files Browse the repository at this point in the history
  • Loading branch information
RanabirChakraborty authored and rpelisse committed Jan 9, 2025
1 parent 1b69110 commit cd443a8
Show file tree
Hide file tree
Showing 41 changed files with 19 additions and 40 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Zeus
====

[![Build Status](https://github.com/jboss-set/zeus/workflows/CI/badge.svg)](https://github.com/jboss-set/zeus/actions/workflows/ci.yml)

These are Ansible configuration scripts for the Olympus JBoss SET CI server.

### Prerequisites:
Expand Down
2 changes: 1 addition & 1 deletion molecule/account/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
5 changes: 5 additions & 0 deletions molecule/account/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
- name: Prepare
hosts: all
gather_facts: yes
vars_files:
- vars.yml
tasks:

- name: "Include common prepare tasks"
ansible.builtin.include_tasks: ../prepare.yml
vars:
users:
- "{{ account.username }}"
1 change: 0 additions & 1 deletion molecule/account/verify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Verify for account role
hosts: all
become: yes
vars_files:
- vars.yml
gather_facts: false
Expand Down
1 change: 0 additions & 1 deletion molecule/aphrodite/converge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Converge
hosts: all
become: yes
vars_files:
- vars.yml

Expand Down
2 changes: 1 addition & 1 deletion molecule/aphrodite/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
1 change: 0 additions & 1 deletion molecule/aphrodite/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
- { path: /opt/tools, owner: "{{ aphrodite_user }}", group: "{{ aphrodite_user }}" }

- name: "Deploy aphrodite configuration to {{ aphrodite.path }}"
become: yes
ansible.builtin.template:
src: "../../roles/aphrodite/templates/aphrodite.json.j2"
dest: "{{ aphrodite.path }}"
Expand Down
1 change: 0 additions & 1 deletion molecule/aphrodite/verify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Verify for aphrodite role
hosts: all
become: yes
vars_files:
- vars.yml
gather_facts: false
Expand Down
2 changes: 1 addition & 1 deletion molecule/bashrc/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
2 changes: 1 addition & 1 deletion molecule/cron/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
1 change: 0 additions & 1 deletion molecule/fast_yum_install/converge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Converge
hosts: all
become: yes
vars_files:
- vars.yml
tasks:
Expand Down
2 changes: 1 addition & 1 deletion molecule/fast_yum_install/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
2 changes: 1 addition & 1 deletion molecule/git/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
1 change: 0 additions & 1 deletion molecule/hosts/converge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Converge
hosts: all
become: yes
vars_files:
- vars.yml
tasks:
Expand Down
2 changes: 1 addition & 1 deletion molecule/hosts/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
2 changes: 0 additions & 2 deletions molecule/hosts/verify.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
---
- name: Verify for hosts role
hosts: all
become: yes
vars_files:
- vars.yml
gather_facts: false

tasks:
- name: Add Ansible inventory mappings to /etc/fake_hosts
become: true
ansible.builtin.blockinfile:
path: "/etc/fake_hosts"
block: |
Expand Down
2 changes: 1 addition & 1 deletion molecule/java/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
1 change: 0 additions & 1 deletion molecule/kdump/converge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Converge
hosts: all
become: yes
vars_files:
- vars.yml
tasks:
Expand Down
2 changes: 1 addition & 1 deletion molecule/kdump/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
1 change: 0 additions & 1 deletion molecule/kdump/verify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Verify for kdump role
hosts: all
become: yes
vars_files:
- vars.yml
gather_facts: false
Expand Down
2 changes: 1 addition & 1 deletion molecule/motd/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
1 change: 0 additions & 1 deletion molecule/motd/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
gather_facts: yes
tasks:
- name: Add a duplicate motd
become: yes
ansible.builtin.copy:
src: "../../roles/motd/files/motd.standard"
dest: /etc/duplicateMotd
Expand Down
1 change: 0 additions & 1 deletion molecule/netrc/converge.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Converge
hosts: all
become: yes
vars_files:
- vars.yml
tasks:
Expand Down
2 changes: 1 addition & 1 deletion molecule/netrc/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
1 change: 0 additions & 1 deletion molecule/netrc/verify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- name: Verify for netrc role
hosts: all
become: yes
vars_files:
- vars.yml
gather_facts: false
Expand Down
1 change: 0 additions & 1 deletion molecule/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
loop_var: user

- name: "Creates directory"
become: yes
ansible.builtin.file:
path: "{{ dir.path }}"
state: "{{ dir.state | default('directory') }}"
Expand Down
1 change: 0 additions & 1 deletion molecule/qualys_fix/converge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Converge
become: yes
hosts: all

tasks:
Expand Down
2 changes: 1 addition & 1 deletion molecule/qualys_fix/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ driver:
name: podman
platforms:
- name: instance
image: registry.access.redhat.com/ubi8/ubi-init:latest
image: registry.access.redhat.com/ubi9/ubi-init:latest
pre_build_image: true
privileged: true
command: "/usr/sbin/init"
Expand Down
1 change: 0 additions & 1 deletion molecule/qualys_fix/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

tasks:
- name: "Escalate privileges"
become: yes
block:
- name: Add a duplicate Windows specific tasks
ansible.builtin.template:
Expand Down
1 change: 0 additions & 1 deletion roles/account/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
quiet: true

- name: "Escalate privilege"
become: yes
block:
- name: "Ensure group {{ account.group }} exists."
ansible.builtin.group:
Expand Down
1 change: 0 additions & 1 deletion roles/aphrodite/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
quiet: true

- name: "Deploy aphrodite configuration to {{ aphrodite.path }}"
become: yes
ansible.builtin.template:
src: "{{ aphrodite.template }}"
dest: "{{ aphrodite.path }}"
Expand Down
1 change: 0 additions & 1 deletion roles/bashrc/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: Check bashrc configuration
become: yes
ansible.builtin.template:
src: templates/bashrc.j2
dest: /etc/bashrc
Expand Down
1 change: 0 additions & 1 deletion roles/cron/tasks/cronjob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
quiet: true

- name: "Escalate privileges"
become: yes
block:
- name: "Ensures script job for {{ jobs.name }} is deployed"
ansible.builtin.template:
Expand Down
1 change: 0 additions & 1 deletion roles/fast_yum_install/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
quiet: true

- name: "Escalate privileges"
become: yes
block:
- name: "Test if package {{ package_name }} is already installed"
ansible.builtin.command: rpm -q {{ package_name }}
Expand Down
1 change: 0 additions & 1 deletion roles/git/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package_name: git

- name: "Ensures gitconfig is deployed for user root"
become: yes
ansible.builtin.template:
src: templates/gitconfig.j2
dest: "{{ config.home }}/.gitconfig"
Expand Down
1 change: 0 additions & 1 deletion roles/hosts/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
- block:
- name: Add Ansible inventory mappings to /etc/hosts
become: true
ansible.builtin.blockinfile:
path: "{{ hosts_path_to_file }}"
block: |
Expand Down
1 change: 0 additions & 1 deletion roles/java/tasks/archive_tool_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
path_to_archive: "{{ home_folder }}/{{ files.name }}{{ files.ext | default('.tgz') }}"

- name: "Escalate priviliges"
become: yes
block:
- ansible.builtin.stat:
path: "{{ path_to_archive }}"
Expand Down
1 change: 0 additions & 1 deletion roles/java/tasks/install_and_default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
loop_var: files

- name: "Symlink {{ tool_default_link }} to default version: {{ tool_default }}."
become: yes
ansible.builtin.file:
src: "{{ tool_default }}"
dest: "{{ tool_default_link }}"
Expand Down
1 change: 0 additions & 1 deletion roles/java/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
quiet: true

- name: "Ensures the tools home folder exits."
become: yes
ansible.builtin.file:
state: directory
path: "{{ folders }}"
Expand Down
1 change: 0 additions & 1 deletion roles/motd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
motd_src_file: "files/motd.{{ motd.font }}"

- name: Add a specific motd
become: yes
ansible.builtin.copy:
src: "files/motd.{{ motd.font }}"
dest: /etc/motd
Expand Down
1 change: 0 additions & 1 deletion roles/qualys_fix/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
- name: "Replace content of Windows specific tasks, that are not Ansible 2.21 compliant"
become: yes
ansible.builtin.template:
dest: "{{ tasks }}"
src: templates/dummy.j2
Expand Down

0 comments on commit cd443a8

Please sign in to comment.