Skip to content

Commit 349807a

Browse files
exitfoundexitfound
committed
Semptember ansible updates
1 parent 2ebfbe8 commit 349807a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+263
-377
lines changed

‎ansible/roles/docker-jenkins-agent/molecule/docker-debian/converge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Converge
44
hosts: all
55
tasks:
6-
# Данный шаг вызывает роль docker-jenkins-agent для прогона тестов:
6+
# Данный шаг вызывает роль docker-jenkins-agent для прогона тестов с помощью Molecule:
77
- name: "Include docker-jenkins-agent role for testing"
88
include_role:
99
name: "docker-jenkins-agent"

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,22 @@ platforms:
8181
security_opts:
8282
- seccomp=unconfined
8383

84-
# - name: ubuntu24.04
85-
# image: mdd13/ansible-docker-ubuntu:ubuntu24.04
86-
# pre_build_image: true
87-
# tmpfs:
88-
# - /run
89-
# - /tmp
90-
# volumes:
91-
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
92-
# privileged: true
93-
# capabilities:
94-
# - SYS_ADMIN
95-
# cgroup_parent: docker.slice
96-
# cgroupns_mode: host
97-
# override_command: false
98-
# security_opts:
99-
# - seccomp=unconfined
84+
- name: ubuntu24.04
85+
image: mdd13/ansible-docker-ubuntu:ubuntu24.04
86+
pre_build_image: true
87+
tmpfs:
88+
- /run
89+
- /tmp
90+
volumes:
91+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
92+
privileged: true
93+
capabilities:
94+
- SYS_ADMIN
95+
cgroup_parent: docker.slice
96+
cgroupns_mode: host
97+
override_command: false
98+
security_opts:
99+
- seccomp=unconfined
100100

101101
provisioner:
102102
name: ansible
@@ -108,7 +108,7 @@ provisioner:
108108
docker_jenkins_agent_name: "docker-jenkins-agent"
109109
docker_jenkins_agent_image: "jenkins/ssh-agent:alpine"
110110
docker_jenkins_agent_ssh_port: "2222"
111-
docker_jenkins_agent_public_key: "ssh-rsa yourpublickey"
111+
docker_jenkins_agent_public_key: "ssh-rsa testpublickey"
112112

113113
verifier:
114114
name: ansible

‎ansible/roles/docker-jenkins-agent/molecule/docker-debian/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
- name: Verify
44
hosts: all
55
tasks:
6-
- name: Output the result
6+
- name: Output the final result
77
assert:
88
that: true

‎ansible/roles/docker-jenkins-agent/molecule/docker-redhat/converge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Converge
44
hosts: all
55
tasks:
6-
# Данный шаг вызывает роль docker-jenkins-agent для прогона тестов:
6+
# Данный шаг вызывает роль docker-jenkins-agent для прогона тестов с помощью Molecule:
77
- name: "Include docker-jenkins-agent role for testing"
88
include_role:
99
name: "docker-jenkins-agent"

‎ansible/roles/docker-jenkins-agent/molecule/docker-redhat/molecule.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ provisioner:
3636
docker_jenkins_agent_name: "docker-jenkins-agent"
3737
docker_jenkins_agent_image: "jenkins/ssh-agent:alpine"
3838
docker_jenkins_agent_ssh_port: "2222"
39-
docker_jenkins_agent_public_key: "ssh-rsa yourpublickey"
39+
docker_jenkins_agent_public_key: "ssh-rsa testpublickey"
4040

4141
verifier:
4242
name: ansible

‎ansible/roles/docker-jenkins-agent/molecule/docker-redhat/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
- name: Verify
44
hosts: all
55
tasks:
6-
- name: Output the result
6+
- name: Output the final result
77
assert:
88
that: true

‎ansible/roles/docker-jenkins-agent/molecule/docker-suse/converge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Converge
44
hosts: all
55
tasks:
6-
# Данный шаг вызывает роль docker-jenkins-agent для прогона тестов:
6+
# Данный шаг вызывает роль docker-jenkins-agent для прогона тестов с помощью Molecule:
77
- name: "Include docker-jenkins-agent role for testing"
88
include_role:
99
name: "docker-jenkins-agent"

‎ansible/roles/docker-jenkins-agent/molecule/docker-suse/molecule.yml

+5-17
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,8 @@ driver:
66
name: docker
77

88
platforms:
9-
- name: opensuse15.3
10-
image: mdd13/ansible-docker-suse:opensuse15.3
11-
pre_build_image: true
12-
privileged: true
13-
override_command: false
14-
cgroupns_mode: host
15-
tmpfs:
16-
- /var/lib/docker
17-
- /tmp
18-
security_opts:
19-
- seccomp=unconfined
20-
21-
- name: opensuse15.4
22-
image: mdd13/ansible-docker-suse:opensuse15.4
9+
- name: opensuse15.5
10+
image: mdd13/ansible-docker-suse:opensuse15.5
2311
pre_build_image: true
2412
privileged: true
2513
override_command: false
@@ -30,8 +18,8 @@ platforms:
3018
security_opts:
3119
- seccomp=unconfined
3220

33-
- name: opensuse15.5
34-
image: mdd13/ansible-docker-suse:opensuse15.5
21+
- name: opensuse15.6
22+
image: mdd13/ansible-docker-suse:opensuse15.6
3523
pre_build_image: true
3624
privileged: true
3725
override_command: false
@@ -52,7 +40,7 @@ provisioner:
5240
docker_jenkins_agent_name: "docker-jenkins-agent"
5341
docker_jenkins_agent_image: "jenkins/ssh-agent:alpine"
5442
docker_jenkins_agent_ssh_port: "2222"
55-
docker_jenkins_agent_public_key: "ssh-rsa yourpublickey"
43+
docker_jenkins_agent_public_key: "ssh-rsa testpublickey"
5644

5745
verifier:
5846
name: ansible

‎ansible/roles/docker-jenkins-agent/molecule/docker-suse/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
- name: Verify
44
hosts: all
55
tasks:
6-
- name: Output the result
6+
- name: Output the final result
77
assert:
88
that: true

‎ansible/roles/docker-jenkins-agent/tasks/debian.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
name: system-docker
1212
tasks_from: main
1313

14-
# Создание директории для хранения файла docker-compose, для последующего запуска Docker Jenkins Agent:
14+
# Создание директории для хранения файла Docker Compose, для последующего запуска Docker Jenkins Agent:
1515
- name: Create Jenkins Agent directories on Debian family distro
1616
file:
1717
state: directory
@@ -35,8 +35,8 @@
3535
changed_when: false
3636

3737
# Запуск Docker Jenkins Agent с помощью docker-compose на удаленном узле:
38-
- name: Run Jenkins Agent via docker-compose on Debian family distro
39-
command: docker-compose -f {{ docker_jenkins_agent_directory }}/{{ docker_jenkins_agent_compose_file }} up -d --build --force-recreate
38+
- name: Run Jenkins Agent via Docker Compose on Debian family distro
39+
command: docker compose -f {{ docker_jenkins_agent_directory }}/{{ docker_jenkins_agent_compose_file }} up -d --build --force-recreate
4040
register: docker_compose_output
4141
changed_when: false
4242

‎ansible/roles/docker-jenkins-agent/tasks/redhat.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
name: system-docker
1212
tasks_from: main
1313

14-
# Создание директории для хранения файла docker-compose, для последующего запуска Docker Jenkins Agent:
14+
# Создание директории для хранения файла Docker Compose, для последующего запуска Docker Jenkins Agent:
1515
- name: Create Jenkins Agent directories on RedHat family distro
1616
file:
1717
state: directory
@@ -34,9 +34,9 @@
3434
group: "{{ docker_jenkins_agent_group }}"
3535
changed_when: false
3636

37-
# Запуск Docker Jenkins Agent с помощью docker-compose на удаленном узле:
38-
- name: Run Jenkins Agent via docker-compose on RedHat family distro
39-
command: docker-compose -f {{ docker_jenkins_agent_directory }}/{{ docker_jenkins_agent_compose_file }} up -d --build --force-recreate
37+
# Запуск Docker Jenkins Agent с помощью Docker Compose на удаленном узле:
38+
- name: Run Jenkins Agent via Docker Compose on RedHat family distro
39+
command: docker compose -f {{ docker_jenkins_agent_directory }}/{{ docker_jenkins_agent_compose_file }} up -d --build --force-recreate
4040
register: docker_compose_output
4141
changed_when: false
4242

‎ansible/roles/docker-jenkins-agent/tasks/suse.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
name: system-docker
1212
tasks_from: main
1313

14-
# Создание директории для хранения файла docker-compose, для последующего запуска Docker Jenkins Agent:
14+
# Создание директории для хранения файла Docker Compose, для последующего запуска Docker Jenkins Agent:
1515
- name: Create Jenkins Agent directories on SUSE family distro
1616
file:
1717
state: directory
@@ -34,9 +34,9 @@
3434
group: "{{ docker_jenkins_agent_group }}"
3535
changed_when: false
3636

37-
# Запуск Docker Jenkins Agent с помощью docker-compose на удаленном узле:
38-
- name: Run Jenkins Agent via docker-compose on SUSE family distro
39-
command: docker-compose -f {{ docker_jenkins_agent_directory }}/{{ docker_jenkins_agent_compose_file }} up -d --build --force-recreate
37+
# Запуск Docker Jenkins Agent с помощью Docker Compose на удаленном узле:
38+
- name: Run Jenkins Agent via Docker Compose on SUSE family distro
39+
command: docker compose -f {{ docker_jenkins_agent_directory }}/{{ docker_jenkins_agent_compose_file }} up -d --build --force-recreate
4040
register: docker_compose_output
4141
changed_when: false
4242

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ services:
55
image: {{ docker_jenkins_agent_image }}
66
ports:
77
- "{{ docker_jenkins_agent_ssh_port }}:22"
8-
restart: always
8+
restart: on-failure
99
environment:
1010
JENKINS_AGENT_SSH_PUBKEY: {{ docker_jenkins_agent_public_key }}

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

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# Переменные, необходимые для установки и настройки Jenkins via Docker, применимые ко всем дистрибутивам в равной степени:
44

5+
jenkins_backup_dir: "/opt/jenkins_backup"
56
jenkins_config_dir: "/opt/jenkins_config"
67
jenkins_inactive_config_dir: "/opt/jenkins_inactive_config"
78
jenkins_data_dir: "/opt/jenkins_data"

‎ansible/roles/docker-jenkins/files/Dockerfile

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
FROM jenkins/jenkins:lts-jdk11
1+
FROM jenkins/jenkins:lts-jdk21
22

33
LABEL maintainer="Ivan Medaev"
44

55
USER root
66

77
RUN mkdir -p /var/jenkins_config/casc_configs/ /var/jenkins_backup \
88
&& chown -R jenkins:jenkins /var/jenkins_home /var/jenkins_config /var/jenkins_backup \
9+
&& chmod -R u+s /var/jenkins_home /var/jenkins_config /var/jenkins_backup \
10+
&& chmod -R 755 /usr/bin/* usr/sbin/unix_chkpwd usr/lib/openssh/ssh-keysign \
911
&& apt-get update \
1012
&& apt-get -y install --no-install-recommends \
1113
apt-utils \
12-
net-tools \
1314
iproute2 \
15+
net-tools \
1416
&& apt-get clean \
1517
&& apt-get autoremove -y \
16-
&& rm -rf /var/lib/apt /var/lib/dpkg /tmp/* /var/tmp/*
18+
&& rm -rf /var/lib/apt/lists /var/lib/dpkg /tmp/* /var/tmp/*
1719

1820
USER jenkins
1921

@@ -25,3 +27,5 @@ ENV CASC_JENKINS_CONFIG=/var/jenkins_config/casc_configs/
2527
COPY --chown=jenkins:jenkins plugins.txt /var/jenkins_config/
2628

2729
RUN jenkins-plugin-cli -f /var/jenkins_config/plugins.txt
30+
31+
HEALTHCHECK --interval=5m --timeout=3s CMD ["curl", "-f", "http://localhost:8080 || exit 1"]

‎ansible/roles/docker-jenkins/files/jenkins-docker-compose.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ services:
1313
volumes:
1414
- /opt/jenkins_config:/var/jenkins_config/casc_configs
1515
- /opt/jenkins_data:/var/jenkins_home
16+
- /opt/jenkins_backup:/var/jenkins_backup
1617
networks:
1718
- jenkins
1819
restart: on-failure

‎ansible/roles/docker-jenkins/files/plugins.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
antisamy-markup-formatter
21
adoptopenjdk
2+
antisamy-markup-formatter
33
apache-httpcomponents-client-4-api
44
authorize-project
5-
branch-api
65
bouncycastle-api
6+
branch-api
77
cloudbees-folder
88
checks-api
9-
configuration-as-code
109
credentials
1110
credentials-binding
11+
configuration-as-code
1212
commons-text-api
1313
display-url-api
1414
docker-java-api
@@ -37,10 +37,9 @@ mailer
3737
matrix-auth
3838
matrix-project
3939
nodejs
40-
pam-auth
4140
okhttp-api
41+
pam-auth
4242
periodicbackup
43-
plain-credentials
4443
pipeline-build-step
4544
pipeline-graph-analysis
4645
pipeline-github-lib
@@ -52,6 +51,7 @@ pipeline-model-extensions
5251
pipeline-rest-api
5352
pipeline-stage-tags-metadata
5453
pipeline-stage-view
54+
plain-credentials
5555
role-strategy
5656
script-security
5757
scm-api

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Converge
44
hosts: all
55
tasks:
6-
# Данный шаг вызывает роль docker-jenkins для прогона тестов:
6+
# Данный шаг вызывает роль docker-jenkins для прогона тестов с помощью Molecule:
77
- name: "Include docker-jenkins role for testing"
88
include_role:
99
name: "docker-jenkins"

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

+3-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
hosts: all
55
tasks:
66
# Добавление интервала по времени для загрузки Jenkins:
7-
- name: Waiting 30 second for checking Jenkins
7+
- name: Wait 30 second for checking Jenkins
88
wait_for:
99
timeout: 30
1010

@@ -14,12 +14,6 @@
1414
url: "http://127.0.0.1:8080"
1515
method: GET
1616
timeout: 30
17-
return_content: true
17+
return_content: false
1818
validate_certs: no
19-
status_code: [200, 403]
20-
register: output
21-
22-
# Результат выполненной ранее проверки:
23-
- name: Output the result of a registered variable
24-
debug:
25-
msg: "{{ output.content }}"
19+
status_code: [200,403]

‎ansible/roles/docker-jenkins/molecule/docker-redhat/converge.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
- name: Converge
44
hosts: all
55
tasks:
6-
# Данный шаг вызывает роль docker-jenkins для прогона тестов:
6+
7+
# Данный шаг вызывает роль docker-jenkins для прогона тестов с помощью Molecule:
78
- name: "Include docker-jenkins role for testing"
89
include_role:
910
name: "docker-jenkins"

‎ansible/roles/docker-jenkins/molecule/docker-redhat/verify.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
hosts: all
55
tasks:
66
# Добавление интервала по времени для загрузки Jenkins:
7-
- name: Waiting 30 second for checking Jenkins
7+
- name: Wait 30 second for checking Jenkins
88
wait_for:
99
timeout: 30
1010

@@ -14,12 +14,6 @@
1414
url: "http://127.0.0.1:8080"
1515
method: GET
1616
timeout: 30
17-
return_content: true
17+
return_content: false
1818
validate_certs: no
19-
status_code: [200, 403]
20-
register: output
21-
22-
# Результат выполненной ранее проверки:
23-
- name: Output the result of a registered variable
24-
debug:
25-
msg: "{{ output.content }}"
19+
status_code: [200,403]

‎ansible/roles/docker-jenkins/molecule/docker-suse/converge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Converge
44
hosts: all
55
tasks:
6-
# Данный шаг вызывает роль docker-jenkins для прогона тестов:
6+
# Данный шаг вызывает роль docker-jenkins для прогона тестов с помощью Molecule:
77
- name: "Include docker-jenkins role for testing"
88
include_role:
99
name: "docker-jenkins"

0 commit comments

Comments
 (0)