[Security] jenkins/* - Update Jenkins to 2.235.5 (#481)

widdix · Aug 19, 2020 · 4855c0f · 4855c0f
1 parent f3155b4
commit 4855c0f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/jenkins/jenkins2-ha-agents.yaml b/jenkins/jenkins2-ha-agents.yaml
@@ -924,7 +924,7 @@ Resources:
         install:
           packages:
             rpm:
-              jenkins: 'http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.235.4-1.1.noarch.rpm'
+              jenkins: 'http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.235.5-1.1.noarch.rpm'
             yum:
               'java-1.8.0-amazon-corretto': []
               'ruby': []

diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml
@@ -835,7 +835,7 @@ Resources:
         install:
           packages:
             rpm:
-              jenkins: 'http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.235.4-1.1.noarch.rpm'
+              jenkins: 'http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.235.5-1.1.noarch.rpm'
             yum:
               'java-1.8.0-amazon-corretto': []
           files:

diff --git a/state/rds-aurora-serverless.yaml b/state/rds-aurora-serverless.yaml
@@ -134,13 +134,11 @@ Parameters:
     Description: 'Aurora Serverless MySQL version.'
     Type: String
     Default: '5.6.10a'
-    AllowedValues: ['5.6.10a', '5.7.mysql_aurora.2.07.1'] # aws rds describe-db-engine-versions --query 'DBEngineVersions[?contains(`["aurora", "aurora-mysql"]`, Engine) && contains(SupportedEngineModes,`serverless`)]'
+    AllowedValues: ['5.6.10a'] # aws rds describe-db-engine-versions --engine aurora --query 'DBEngineVersions[?contains(SupportedEngineModes,`serverless`)]'
 Mappings:
   EngineVersionMap:
     '5.6.10a':
       ClusterParameterGroupFamily: 'aurora5.6'
-    '5.7.mysql_aurora.2.07.1':
-      ClusterParameterGroupFamily: 'aurora-mysql5.7'
 Conditions:
   HasZone: !Not [!Equals [!Ref ParentZoneStack, '']]
   HasSSHBastionSecurityGroup: !Not [!Equals [!Ref ParentSSHBastionStack, '']]