Skip to content

Commit 6e9b146

Browse files
committedJan 2, 2025·
Add simple updates to the project
1 parent a928e0b commit 6e9b146

File tree

8 files changed

+63
-45
lines changed

8 files changed

+63
-45
lines changed
 

‎.github/workflows/molecule-build-images.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
hadolint:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-22.04
1010
strategy:
1111
fail-fast: false
1212
max-parallel: 3
@@ -31,7 +31,7 @@ jobs:
3131

3232
build-suse-image:
3333
needs: hadolint
34-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-22.04
3535
steps:
3636
- name: Checkout Repository
3737
uses: actions/checkout@v4
@@ -79,14 +79,14 @@ jobs:
7979

8080
build-redhat-image:
8181
needs: hadolint
82-
runs-on: ubuntu-latest
82+
runs-on: ubuntu-22.04
8383
steps:
8484
- name: Checkout Repository
8585
uses: actions/checkout@v4
8686

8787
build-redhat-image-matrix:
8888
needs: build-redhat-image
89-
runs-on: ubuntu-latest
89+
runs-on: ubuntu-22.04
9090
strategy:
9191
fail-fast: false
9292
max-parallel: 3
@@ -127,7 +127,7 @@ jobs:
127127

128128
build-debian-image:
129129
needs: hadolint
130-
runs-on: ubuntu-latest
130+
runs-on: ubuntu-22.04
131131
steps:
132132
- name: Checkout Repository
133133
uses: actions/checkout@v4
@@ -175,7 +175,7 @@ jobs:
175175

176176
build-ubuntu-image:
177177
needs: hadolint
178-
runs-on: ubuntu-latest
178+
runs-on: ubuntu-22.04
179179
steps:
180180
- name: Checkout Repository
181181
uses: actions/checkout@v4

‎ansible/roles/docker-jenkins/templates/jenkins.yaml.j2

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ jenkins:
1515
standard:
1616
excludeClientIPFromCrumb: true
1717

18-
# Отключает или включает Master Access Control (deprecated):
19-
remotingSecurity:
20-
enabled: true
21-
2218
# Эта опция позволяет задать глобальные переменные в Jenkins (при желании можно раскомментировать):
2319
# globalNodeProperties:
2420
# - envVars:

‎ansible/roles/manual-jenkins/defaults/main.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ debian_packages_list:
4343
- openjdk-17-jre
4444
- fontconfig
4545

46+
debian_java_link: "/usr/bin/java"
47+
debian_java_path: "/usr/lib/jvm/jdk-17.0.2/bin/java"
48+
debian_javac_link: "/usr/bin/javac"
49+
debian_javac_path: "/usr/lib/jvm/jdk-17.0.2/bin/javac"
50+
debian_old_archive: "https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz"
4651
debian_old_packages_list:
4752
- openjdk-11-jdk
4853
- fontconfig

‎ansible/roles/manual-jenkins/molecule/docker-debian/molecule.yml

+23-23
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ platforms:
1616
security_opts:
1717
- seccomp=unconfined
1818

19-
- name: debian11
20-
image: mdd13/ansible-docker-debian:debian11
21-
pre_build_image: true
22-
privileged: true
23-
override_command: false
24-
cgroup_parent: docker.slice
25-
cgroupns_mode: host
26-
security_opts:
27-
- seccomp=unconfined
19+
# - name: debian11
20+
# image: mdd13/ansible-docker-debian:debian11
21+
# pre_build_image: true
22+
# privileged: true
23+
# override_command: false
24+
# cgroup_parent: docker.slice
25+
# cgroupns_mode: host
26+
# security_opts:
27+
# - seccomp=unconfined
2828

29-
- name: debian12
30-
image: mdd13/ansible-docker-debian:debian12
31-
pre_build_image: true
32-
tmpfs:
33-
- /run
34-
- /tmp
35-
volumes:
36-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
37-
privileged: true
38-
capabilities:
39-
- SYS_ADMIN
40-
cgroup_parent: docker.slice
41-
cgroupns_mode: host
42-
override_command: false
29+
# - name: debian12
30+
# image: mdd13/ansible-docker-debian:debian12
31+
# pre_build_image: true
32+
# tmpfs:
33+
# - /run
34+
# - /tmp
35+
# volumes:
36+
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
37+
# privileged: true
38+
# capabilities:
39+
# - SYS_ADMIN
40+
# cgroup_parent: docker.slice
41+
# cgroupns_mode: host
42+
# override_command: false
4343

4444
provisioner:
4545
name: ansible

‎ansible/roles/manual-jenkins/tasks/debian.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,31 @@
3636
state: present
3737
when: ansible_distribution == 'Debian' and ansible_distribution_major_version | int == 10
3838

39+
- name: Download archive with Java 17 on Debian family distro (Only Debian 10)
40+
unarchive:
41+
src: "{{ debian_old_archive }}"
42+
dest: "/usr/lib/jvm"
43+
remote_src: yes
44+
when: ansible_distribution == 'Debian' and ansible_distribution_major_version | int == 10
45+
46+
- name: Set Java 17 path on Debian family distro (Only Debian 10)
47+
alternatives:
48+
name: "java"
49+
path: "{{ debian_java_path }}"
50+
link: "{{ debian_java_link }}"
51+
state: selected
52+
priority: 1
53+
when: ansible_distribution == 'Debian' and ansible_distribution_major_version | int == 10
54+
55+
- name: Set Javac 17 path on Debian family distro (Only Debian 10)
56+
alternatives:
57+
name: "javac"
58+
path: "{{ debian_javac_path }}"
59+
link: "{{ debian_javac_link }}"
60+
state: selected
61+
priority: 1
62+
when: ansible_distribution == 'Debian' and ansible_distribution_major_version | int == 10
63+
3964
# Установка непосредственно самого пакета Jenkins:
4065
- name: Install Jenkins package on Debian family distro
4166
apt:

‎ansible/roles/manual-jenkins/templates/jenkins.yaml.j2

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ jenkins:
1515
standard:
1616
excludeClientIPFromCrumb: true
1717

18-
# Отключает или включает Master Access Control (deprecated):
19-
remotingSecurity:
20-
enabled: true
21-
2218
# Эта опция позволяет задать глобальные переменные в Jenkins:
2319
globalNodeProperties:
2420
- envVars:

‎jcasc/jenkins.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ jenkins:
1616
standard:
1717
excludeClientIPFromCrumb: true
1818

19-
# Отключает или включает Master Access Control (deprecated):
20-
remotingSecurity:
21-
enabled: true
22-
2319
# Эта опция позволяет задать глобальные переменные в Jenkins (при желании можно раскомментировать):
2420
# globalNodeProperties:
2521
# - envVars:

‎requirements.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ansible == 9.5.1
2-
ansible-lint == 6.22.1
1+
ansible == 9.13.0
2+
ansible-lint == 6.22.2
33
docker == 7.0.0
44
molecule == 6.0.3
5-
molecule-plugins[docker] == 23.5.0
5+
molecule-plugins[docker] == 23.6.0
66
requests == 2.31.0
7-
yamllint == 1.33.0
7+
yamllint == 1.35.0

0 commit comments

Comments
 (0)