PMM-7 Update Jenkins. (#2317)

* PMM-7 Update Jenkins. * PMM-7 Update username for SSH access to Jenkins.
Percona-Lab · Oct 10, 2023 · 1e60fb7 · 1e60fb7
1 parent c0b9139
commit 1e60fb7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/IaC/pmm.cd/JenkinsStack.yml b/IaC/pmm.cd/JenkinsStack.yml
@@ -46,11 +46,11 @@ Parameters:
 Mappings:
   AmazonLinux2:
     us-east-1:
-      x64: ami-05f408238af346b4f
+      x64: ami-0d887a308369b6881
     us-east-2:
-      x64: ami-08c50cb06459e56a4
+      x64: ami-0e534f3e5321ed9ed
     us-west-2:
-      x64: ami-0f9fff25f1c7ca4f0
+      x64: ami-0044a0897b53acfb6
 
 Resources:
 
@@ -622,7 +622,7 @@ Resources:
                   amazon-linux-extras install epel -y
                   amazon-linux-extras install java-openjdk11 -y
                   yum -y update --security
-                  yum -y install jenkins-2.387.2 certbot git yum-cron aws-cli xfsprogs openresty
+                  yum -y install jenkins-2.414.2 certbot git yum-cron aws-cli xfsprogs openresty
 
                   sed -i 's/update_cmd = default/update_cmd = security/' /etc/yum/yum-cron.conf
                   sed -i 's/apply_updates = no/apply_updates = yes/'     /etc/yum/yum-cron.conf
@@ -770,10 +770,6 @@ Resources:
               			  ssl_trusted_certificate     /etc/nginx/ssl/ca-certs.pem;
               			  ssl_dhparam                 /etc/nginx/ssl/dhparam.pem;
 
-              			  ssl_protocols TLSv1.2;
-              			  ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-              			  ssl_prefer_server_ciphers off;
-
               			  resolver                    8.8.8.8 ipv6=off;
               			  lua_ssl_trusted_certificate /etc/pki/tls/certs/ca-bundle.crt;
               			  lua_ssl_verify_depth        3;
@@ -852,7 +848,7 @@ Resources:
               }
 
               setup_ssh_keys() {
-                KEYS_LIST="alexander.tymchuk \
+                KEYS_LIST="alexander.demidoff \
                            evgeniy.patlan \
                            alex.miroshnychenko \
                            eduardo.casarero \

diff --git a/IaC/pmm.cd/init.groovy.d/cloud.groovy b/IaC/pmm.cd/init.groovy.d/cloud.groovy
@@ -25,17 +25,17 @@ netMap['us-east-2c'] = 'subnet-00b3df129e7d8c658'
 imageMap = [:]
 imageMap['us-east-2a.min-rhel-7-x64']     = 'ami-00f8e2c955f7ffa9b'               // centos 7
 imageMap['us-east-2a.min-centos-7-x64']   = imageMap['us-east-2a.min-rhel-7-x64'] // centos 7
-imageMap['us-east-2a.min-rhel-8-x64']     = 'ami-02fb9384e880ed67c'               // rocky linux 8
-imageMap['us-east-2a.min-ol-8-x64']       = 'ami-06ac6a66b683196b8'               // oraclelinux 8
-imageMap['us-east-2a.min-rhel-9-x64']     = 'ami-0206fd54d15d43153'               // oraclelinux 9
+imageMap['us-east-2a.min-rhel-8-x64']     = 'ami-0426a691fd088149c'               // rocky linux 8
+imageMap['us-east-2a.min-ol-8-x64']       = 'ami-046d14d0ddf879691'               // oraclelinux 8
+imageMap['us-east-2a.min-rhel-9-x64']     = 'ami-08ac8951dc7903bf1'               // oraclelinux 9
 imageMap['us-east-2a.min-ol-9-x64']       = imageMap['us-east-2a.min-rhel-9-x64'] // oraclelinux 9
-imageMap['us-east-2a.min-bionic-x64']     = 'ami-0a029e6f47affbaec'               // ubuntu 18
-imageMap['us-east-2a.min-focal-x64']      = 'ami-06c4532923d4ba1ec'               // ubuntu 20
-imageMap['us-east-2a.min-jammy-x64']      = 'ami-05537cc6c0fbd4ee7'               // ubuntu 22
+imageMap['us-east-2a.min-bionic-x64']     = 'ami-0bb220fc4bffd88dd'               // ubuntu 18
+imageMap['us-east-2a.min-focal-x64']      = 'ami-01936e31f56bdacde'               // ubuntu 20
+imageMap['us-east-2a.min-jammy-x64']      = 'ami-0e83be366243f524a'               // ubuntu 22
 imageMap['us-east-2a.min-stretch-x64']    = 'ami-0a694f67ea86df8a7'               // debian 9
-imageMap['us-east-2a.min-buster-x64']     = 'ami-0246e87085c5c98e3'               // debian 10
-imageMap['us-east-2a.min-bullseye-x64']   = 'ami-0f35413f664528e13'               // debian 11
-imageMap['us-east-2a.min-bookworm-x64']   = 'ami-05a78d853b2c06c4c'               // debian 12
+imageMap['us-east-2a.min-buster-x64']     = 'ami-0dc2cee9dad26918a'               // debian 10
+imageMap['us-east-2a.min-bullseye-x64']   = 'ami-023766a7f545f3c77'               // debian 11
+imageMap['us-east-2a.min-bookworm-x64']   = 'ami-014d6017733aee708'               // debian 12
 
 imageMap['us-east-2b.min-rhel-7-x64']     = imageMap['us-east-2a.min-rhel-7-x64']
 imageMap['us-east-2b.min-centos-7-x64']   = imageMap['us-east-2a.min-rhel-7-x64'] // centos 7