jenkins: Update AMIs / add CentOS

Updates to allow rebuilding AMIs, including adding a CentOS AMI and
bumping the Automake from 1.15 to 1.16.1, as 1.15 doesn't build
on FreeBSD 11.1 for some reason.

Signed-off-by: Brian Barrett <[email protected]>

Author: bwbarrett

jenkins/agent-setup-script.sh

@@ -70,4 +70,4 @@ install_autotools ()
     export PATH="${old_PATH}"
 }
 
-install_autotools 2.69 1.15 2.4.6 ${SOFTWARE_ROOT}/autotools-2.69-1.15.0-2.4.6
+install_autotools 2.69 1.16.1 2.4.6 ${SOFTWARE_ROOT}/autotools-2.69-1.16.1-2.4.6

jenkins/build-amis.sh

@@ -21,7 +21,7 @@ while getopts "h?a:l" opt; do
     case "$opt" in
     h|\?)
 	echo "usage: build-ami.sh [-a <ami list>]"
-	echo "  -a <ami list>     Only build amis in ami list"
+	echo "  -a <ami list>     Only build amis in ami list (comma separated)"
 	echo "  -l                List ami names available for building"
 	exit 1
 	;;

jenkins/customize-ami.sh

@@ -55,7 +55,7 @@ done
 echo "==> Installing packages"
 
 case $PLATFORM_ID in
-    rhel)
+    rhel|centos)
 	# RHEL's default repos only include the "base" compiler
 	# version, so don't worry about script version
 	# differentiation.
@@ -79,7 +79,7 @@ case $PLATFORM_ID in
 	    python27-boto3
 	labels="${labels} linux amazon_linux_${VERSION_ID}"
 	case $VERSION_ID in
-	    2016.09|2017.03)
+	    2016.09|2017.03|2017.09)
 		# clang == 3.6.2
 		sudo yum -y install gcc44 gcc44-c++ gcc44-gfortran \
 		     gcc48 gcc48-c++ gcc48-gfortran clang
@@ -129,7 +129,7 @@ case $PLATFORM_ID in
 	     python-boto python-boto3 python-mock
 	labels="${labels} linux sles_${VERSION_ID}"
 	case $VERSION_ID in
-	    12.2)
+	    12.2|12.3)
 		# gcc5 == 5.3.1
 		# gcc6 == 6.2.1
 		sudo zypper -n install gcc48 gcc48-c++ gcc48-fortran \

jenkins/packer.json

@@ -7,9 +7,9 @@
   },
   "builders": [{
     "type": "amazon-ebs",
-    "name" : "AmazonLinux17.03",
+    "name" : "AmazonLinux17.09",
     "region": "us-west-2",
-    "source_ami": "ami-4836a428",
+    "source_ami": "ami-d874e0a0",
     "instance_type": "t2.micro",
     "ssh_username": "ec2-user",
     "ssh_pty" : true,
@@ -22,7 +22,7 @@
     "type": "amazon-ebs",
     "name" : "Ubuntu16.04",
     "region": "us-west-2",
-    "source_ami": "ami-a58d0dc5",
+    "source_ami": "ami-4e79ed36",
     "instance_type": "t2.micro",
     "ssh_username": "ubuntu",
     "ssh_pty" : true,
@@ -33,26 +33,39 @@
     "iam_instance_profile" : "{{user `iam_role`}}"
   },{
     "type": "amazon-ebs",
-    "name" : "RHEL73",
+    "name" : "RHEL74",
     "region": "us-west-2",
-    "source_ami": "ami-6f68cf0f",
+    "source_ami": "ami-223f945a",
     "instance_type": "t2.micro",
     "ssh_username": "ec2-user",
     "ssh_pty" : true,
-    "ami_name": "Jenkins RHEL 7.3 {{user `build_date`}}",
+    "ami_name": "Jenkins RHEL 7.4 {{user `build_date`}}",
     "associate_public_ip_address" : true,
     "sriov_support" : true,
     "ena_support" : true,
     "iam_instance_profile" : "{{user `iam_role`}}"
   },{
     "type": "amazon-ebs",
-    "name" : "SLES12sp2",
+    "name" : "CentOS74",
     "region": "us-west-2",
-    "source_ami": "ami-e4a30084",
+    "source_ami": "ami-a042f4d8",
+    "instance_type": "t2.micro",
+    "ssh_username": "centos",
+    "ssh_pty" : true,
+    "ami_name": "Jenkins CentOS 7.4 {{user `build_date`}}",
+    "associate_public_ip_address" : true,
+    "sriov_support" : true,
+    "ena_support" : true,
+    "iam_instance_profile" : "{{user `iam_role`}}"
+  },{
+    "type": "amazon-ebs",
+    "name" : "SLES12sp3",
+    "region": "us-west-2",
+    "source_ami": "ami-6bc56f13",
     "instance_type": "t2.micro",
     "ssh_username": "ec2-user",
     "ssh_pty" : true,
-    "ami_name": "Jenkins SLES 12sp2 {{user `build_date`}}",
+    "ami_name": "Jenkins SLES 12sp3 {{user `build_date`}}",
     "associate_public_ip_address" : true,
     "sriov_support" : true,
     "ena_support" : true,