Skip to content

Commit 2fb6b68

Browse files
committed
jenkins: remove Ubuntu 18 builder
Jenkins does not currently have an Ubuntu 18.04 configuration, so there is not much point in building the AMI. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent 79652f2 commit 2fb6b68

2 files changed

Lines changed: 0 additions & 61 deletions

File tree

jenkins/customize-ami.sh

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -148,26 +148,6 @@ case $PLATFORM_ID in
148148
pandoc_installed=1
149149
labels="${labels} linux ubuntu_${VERSION_ID}-${arch}"
150150
case $VERSION_ID in
151-
18.04)
152-
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
153-
awscli python3-boto3 python-pip python3-venv \
154-
python-mock \
155-
openjdk-17-jre-headless \
156-
gcc-4.8 g++-4.8 gfortran-4.8 \
157-
gcc-5 g++-5 gfortran-5 \
158-
gcc-6 g++-6 gfortran-6 \
159-
gcc-7 g++-7 gfortran-7 \
160-
gcc-8 g++-8 gfortran-8 \
161-
clang-3.9 clang-4.0 clang-5.0 clang-6.0 \
162-
clang-7 clang-8 clang-9
163-
PIP_CMD=pip
164-
sudo ${PIP_CMD} install sphinx recommonmark docutils sphinx-rtd-theme sphobjinv
165-
labels="${labels} gcc48 gcc5 gcc6 gcc7 gcc8 clang39 clang40 clang50 clang60 clang7 clang8 clang9"
166-
if test "$arch" = "x86_64" ; then
167-
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install gcc-multilib g++-multilib gfortran-multilib
168-
labels="${labels} 32bit_builds"
169-
fi
170-
;;
171151
20.04)
172152
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
173153
awscli python-is-python3 python3-boto3 python3-mock \

jenkins/jenkins-amis.pkr.hcl

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -362,47 +362,6 @@ source "amazon-ebs" "SLES15-x86" {
362362
# Ubuntu Linux
363363
#
364364
################################################################################
365-
data "amazon-ami" "Ubuntu1804-x86" {
366-
filters = {
367-
architecture = "x86_64"
368-
name = "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*"
369-
root-device-type = "ebs"
370-
virtualization-type = "hvm"
371-
}
372-
most_recent = true
373-
owners = ["099720109477"]
374-
region = "us-west-2"
375-
include_deprecated = true
376-
}
377-
378-
source "amazon-ebs" "Ubuntu1804-x86" {
379-
ami_block_device_mappings {
380-
delete_on_termination = true
381-
device_name = "/dev/sda1"
382-
volume_size = 16
383-
}
384-
ami_name = "Jenkins Ubuntu 18.04 x86_64 ${var.build_date}"
385-
deprecate_at = "${var.deprecation_date}"
386-
associate_public_ip_address = true
387-
ena_support = true
388-
iam_instance_profile = "${var.iam_role}"
389-
instance_type = "t3.large"
390-
launch_block_device_mappings {
391-
delete_on_termination = true
392-
device_name = "/dev/sda1"
393-
volume_size = 16
394-
}
395-
region = "us-west-2"
396-
source_ami = "${data.amazon-ami.Ubuntu1804-x86.id}"
397-
ssh_pty = true
398-
ssh_username = "ubuntu"
399-
tags = {
400-
BuildType = "${var.BuildType}",
401-
JenkinsBuilderAmi = "True"
402-
}
403-
}
404-
405-
406365
data "amazon-ami" "Ubuntu2004-arm64" {
407366
filters = {
408367
architecture = "arm64"

0 commit comments

Comments
 (0)