Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/checkout…
Browse files Browse the repository at this point in the history
…-4.1.4
  • Loading branch information
steelhead31 committed May 2, 2024
2 parents 5ffe3fd + a82b364 commit d5565c9
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,16 @@ If you are creating a new container with the intention of replacing a container

* The static containers are patched daily using this [script](https://github.com/adoptium/infrastructure/blob/master/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/scripts/updatepackages.sh) which runs on a daily cron job on each of the dockerhost machines.
* The script goes into each container and updates every installed package using the container's package manager, yum, apk, apt etc.

## Inventory

The current static docker inventory is listed in [DockerInventory.json](https://github.com/adoptium/infrastructure/blob/master/ansible/DockerInventory.json).

At the moment we update this file manually; we run the [updateDockerStaticInventory.py](https://github.com/adoptium/infrastructure/blob/master/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/scripts/updateDockerStaticInventory.py) script from the ansible/playbooks directory to find changes in our static docker inventory in jenkins:

```
python3 AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/scripts/updateDockerStaticInventory.py $jenkins-username $jenkins-api-token
```
This script uses [jenkinsapi](https://jenkinsapi.readthedocs.io/en/latest/) which can be installed with `pip install jenkinsapi`.

If any changes are found, open a new branch and commit these changes in a pull request.
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
###########################################

- name: Install gdb & valgrind
become: yes
become: true
package:
update_cache: yes
name: ['gdb', 'valgrind']
state: latest
when: ansible_distribution == "Ubuntu" or
Expand All @@ -19,16 +18,15 @@
tags: performance_tools

- name: Install Perf (except Ubuntu)
become: yes
become: true
package:
update_cache: yes
name: perf
state: latest
when: ansible_distribution != "Ubuntu"
tags: performance_tools

- name: Perf installation (Ubuntu)
become: yes
become: true
when: ansible_distribution == "Ubuntu"
tags: performance_tools
block:
Expand All @@ -42,17 +40,29 @@

- name: Install perf (Ubuntu)
package:
update_cache: yes
name: ['linux-tools-common', 'linux-tools-generic', 'linux-tools-{{ uname.stdout }}']
state: latest
when: "'linux-tools-'~uname.stdout in linux_tools.stdout" # ~ -> concatenates string

- name: Install nmon (except Rhel 7/CentOS 7 s390x) #nmon needs epel repo
become: yes
become: true
package:
update_cache: yes
name: nmon
state: latest
when: not (ansible_distribution_major_version == "7" and ansible_architecture == "s390x" and
(ansible_distribution == "RedHat" or ansible_distribution == "CentOS"))
tags: performance_tools

- name: Set ptrace_scope value in Ubuntu
become: true
when: ansible_distribution == "Ubuntu"
tags: performance_tools
block:
- name: Set ptrace_scope value to 0 in Ubuntu
shell: echo 0 | dd of=/proc/sys/kernel/yama/ptrace_scope

- name: Set ptrace_scope value persistant across reboot
lineinfile:
path: /etc/sysctl.d/10-ptrace.conf
regexp: '^kernel.yama.ptrace_scope'
line: kernel.yama.ptrace_scope = 0
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
- name: Download Visual Studio Community 2022
win_get_url:
url: 'https://aka.ms/vs/17/release/vs_Community.exe'
checksum: 6dfb021f82e9e7f89de632c08a654c0695d7701c3f47bb894508717a9948048f
checksum: 25ce0b366052fdd7eabe151b96c1c781c75e26cb228c9acda71cfe20d1415176
checksum_algorithm: sha256
dest: 'C:\temp\vs_community22.exe'
force: no
Expand Down

0 comments on commit d5565c9

Please sign in to comment.