diff --git a/.github/workflows/semgrep_diff.yml b/.github/workflows/semgrep_diff.yml index e0dfdcd9f0..6c44589a6d 100644 --- a/.github/workflows/semgrep_diff.yml +++ b/.github/workflows/semgrep_diff.yml @@ -12,12 +12,12 @@ jobs: steps: # Step 1: Clone application source code - name: Checkout code - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 0 # Step 2: Differential scan - name: Differential scan run: | - semgrep scan --error --metrics=off --config="p/trailofbits" \ - --baseline-commit ${{ github.event.before }} + semgrep ci \ + --config="p/trailofbits" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml index e487028701..71cc7ab63b 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml @@ -23,7 +23,7 @@ - name: Add Devel-Tools repository (SLES15) zypper_repository: - repo: https://download.opensuse.org/repositories/devel:/tools/15.4/devel:tools.repo + repo: https://download.opensuse.org/repositories/devel:/tools/15.5/devel:tools.repo auto_import_keys: yes state: present when: diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/NTP_TIME/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/NTP_TIME/tasks/main.yml index 8dbd9428ab..d17df7d829 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/NTP_TIME/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/NTP_TIME/tasks/main.yml @@ -37,12 +37,38 @@ - (ansible_distribution == "Ubuntu") or (ansible_distribution == "SLES" and ansible_distribution_major_version == "11") tags: ntp_time +- name: Gather Facts About The Services Present + service_facts: + tags: ntp_time + +- name: Check If NTPD Exists In The Service Facts + set_fact: + ntpd_entry_exists: "{{ 'ntpd.service' in services }}" + when: ansible_facts.services is defined + tags: ntp_time + +- name: Set Fact Where NTPD Is Not Available As A Service + set_fact: + ntpd_entry_exists: "false" + when: ansible_facts.services is not defined + tags: ntp_time + +- name: Display NTPD Status + debug: + var: ntpd_entry_exists + when: + - (ansible_distribution == "RedHat" and ansible_distribution_major_version != "8") or + (ansible_distribution == "SLES" and ansible_distribution_major_version == "12") or + (ansible_distribution == "CentOS" and ansible_distribution_major_version == "7" ) + tags: ntp_time + - name: Start NTP for RedHat, SLES 12 and CentOS 7 service: name: ntpd state: restarted enabled: yes when: + - ntpd_entry_exists | default(false) | bool - (ansible_distribution == "RedHat" and ansible_distribution_major_version != "8") or (ansible_distribution == "SLES" and ansible_distribution_major_version == "12") or (ansible_distribution == "CentOS" and ansible_distribution_major_version == "7" ) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml index 15c0edf5c7..49b1af67d6 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml @@ -66,11 +66,11 @@ - providers - adoptopenjdk -########### -# Marist # -########### +##################### +# Marist & Scaleway # +##################### -# Marist machines need their host template updated for changes to /etc/hosts to persist +# Marist & Scaleway machines need their host template updated for changes to /etc/hosts to persist - name: Update /etc/cloud/cloud.cfg file - To remove update hosts function lineinfile: dest: /etc/cloud/cloud.cfg @@ -78,7 +78,7 @@ state: absent when: - provider_name.rc == 0 - - provider_name.stdout == "marist" + - (provider_name.stdout == "marist" or provider_name.stdout == "scaleway") tags: - providers - adoptopenjdk