[Improvement] jenkins/* - Pin plugin versions (widdix#474)

Author: michaelwittig

Diff for: jenkins/jenkins2-ha-agents.yaml

@@ -924,7 +924,7 @@ Resources:
         install:
           packages:
             rpm:
-              jenkins: 'https://pkg.jenkins.io/redhat-stable/jenkins-2.235.3-1.1.noarch.rpm'
+              jenkins: 'http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.235.3-1.1.noarch.rpm'
             yum:
               'java-1.8.0-amazon-corretto': []
               'ruby': []
@@ -1161,23 +1161,23 @@ Resources:
           files:
             '/root/plugins.txt':
               content: |
-                jqs-monitoring
-                ant
-                build-timeout
-                docker-workflow
-                credentials-binding
-                email-ext
-                envinject
-                github-organization-folder
-                gradle
-                workflow-aggregator
-                pipeline-maven
-                ssh-slaves
-                subversion
-                timestamper
-                ws-cleanup
-                pipeline-aws
-                http_request
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/jqs-monitoring/1.4/jqs-monitoring.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/ant/1.11/ant.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/build-timeout/1.20/build-timeout.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/docker-workflow/1.23/docker-workflow.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/credentials-binding/1.23/credentials-binding.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/email-ext/2.73/email-ext.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/envinject/2.3.0/envinject.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/github-organization-folder/1.6/github-organization-folder.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/gradle/1.36/gradle.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/workflow-aggregator/2.6/workflow-aggregator.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/pipeline-maven/3.8.2/pipeline-maven.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/ssh-slaves/1.31.2/ssh-slaves.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/subversion/2.13.1/subversion.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/timestamper/1.11.5/timestamper.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/ws-cleanup/0.38/ws-cleanup.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/pipeline-aws/1.42/pipeline-aws.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/http_request/1.8.26/http_request.hpi
               mode: '000400'
               owner: root
               group: root

Diff for: jenkins/jenkins2-ha.yaml

@@ -835,7 +835,7 @@ Resources:
         install:
           packages:
             rpm:
-              jenkins: 'https://pkg.jenkins.io/redhat-stable/jenkins-2.235.3-1.1.noarch.rpm'
+              jenkins: 'http://ftp-chi.osuosl.org/pub/jenkins/redhat-stable/jenkins-2.235.3-1.1.noarch.rpm'
             yum:
               'java-1.8.0-amazon-corretto': []
           files:
@@ -870,23 +870,23 @@ Resources:
           files:
             '/root/plugins.txt':
               content: |
-                jqs-monitoring
-                ant
-                build-timeout
-                docker-workflow
-                credentials-binding
-                email-ext
-                envinject
-                github-organization-folder
-                gradle
-                workflow-aggregator
-                pipeline-maven
-                ssh-slaves
-                subversion
-                timestamper
-                ws-cleanup
-                pipeline-aws
-                http_request
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/jqs-monitoring/1.4/jqs-monitoring.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/ant/1.11/ant.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/build-timeout/1.20/build-timeout.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/docker-workflow/1.23/docker-workflow.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/credentials-binding/1.23/credentials-binding.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/email-ext/2.73/email-ext.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/envinject/2.3.0/envinject.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/github-organization-folder/1.6/github-organization-folder.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/gradle/1.36/gradle.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/workflow-aggregator/2.6/workflow-aggregator.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/pipeline-maven/3.8.2/pipeline-maven.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/ssh-slaves/1.31.2/ssh-slaves.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/subversion/2.13.1/subversion.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/timestamper/1.11.5/timestamper.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/ws-cleanup/0.38/ws-cleanup.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/pipeline-aws/1.42/pipeline-aws.hpi
+                http://ftp-chi.osuosl.org/pub/jenkins/plugins/http_request/1.8.26/http_request.hpi
               mode: '000400'
               owner: root
               group: root

Diff for: test/src/test/java/de/widdix/awscftemplates/jenkins/TestJenkins.java

@@ -31,6 +31,7 @@ public void testHA() {
                     this.createStack(context, stackName,
                             "jenkins/jenkins2-ha.yaml",
                             new Parameter().withParameterKey("ParentVPCStack").withParameterValue(vpcStackName),
+                            new Parameter().withParameterKey("MasterInstanceType").withParameterValue("t3a.small"),
                             new Parameter().withParameterKey("KeyName").withParameterValue(keyName),
                             new Parameter().withParameterKey("MasterAdminPassword").withParameterValue(masterAdminPassword),
                             new Parameter().withParameterKey("EFSBackupRetentionPeriod").withParameterValue("0")
@@ -77,6 +78,7 @@ public void testHAAgents() {
                     this.createStack(context, stackName,
                             "jenkins/jenkins2-ha-agents.yaml",
                             new Parameter().withParameterKey("ParentVPCStack").withParameterValue(vpcStackName),
+                            new Parameter().withParameterKey("MasterInstanceType").withParameterValue("t3a.small"),
                             new Parameter().withParameterKey("KeyName").withParameterValue(keyName),
                             new Parameter().withParameterKey("MasterAdminPassword").withParameterValue(masterAdminPassword),
                             new Parameter().withParameterKey("EFSBackupRetentionPeriod").withParameterValue("0")