diff options
| -rwxr-xr-x | jenkins-scripts/basic_settings.sh | 4 | ||||
| -rwxr-xr-x | jenkins-scripts/system_type.sh | 3 | ||||
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 6 | ||||
| -rw-r--r-- | packer/provision/agl_hwtest_dependencies.sh | 5 | ||||
| -rw-r--r-- | packer/provision/baseline.sh | 1 |
5 files changed, 17 insertions, 2 deletions
diff --git a/jenkins-scripts/basic_settings.sh b/jenkins-scripts/basic_settings.sh index daa3b938..0d07c148 100755 --- a/jenkins-scripts/basic_settings.sh +++ b/jenkins-scripts/basic_settings.sh @@ -55,6 +55,10 @@ Host github.com StrictHostKeyChecking no UserKnownHostsFile /dev/null +Host gitlab.com + StrictHostKeyChecking no + UserKnownHostsFile /dev/null + EOSSH cat <<EOKNOWN > /etc/ssh/ssh_known_hosts diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh index 9aeea20d..ca5f893f 100755 --- a/jenkins-scripts/system_type.sh +++ b/jenkins-scripts/system_type.sh @@ -17,7 +17,8 @@ IFS=',' for i in "basebuild,basebuild" \ "centos,centos" \ "trusty,trusty" \ - "xenial,xenial" + "xenial,xenial" \ + "bionic,bionic" do set -- $i if [[ $HOST == *"$1"* ]]; then SYSTEM_TYPE="$2" diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index 3d81d92b..b554ab5e 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -38,10 +38,14 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \ tree rsync python-yaml python-requests curl tar docker.io pandoc python3 \ ruby-all-dev ruby-ffi ruby-ffi-* jekyll ruby-redcarpet mkdocs \ python-pip python-simplejson g++-multilib make zip unzip iperf3 \ - debian-keyring debian-archive-keyring python3-yaml python3-pip python-pip + debian-keyring debian-archive-keyring python3-yaml python3-pip python-pip apt DEBIAN_FRONTEND=noninteractive apt-get clean +DEBIAN_FRONTEND=noninteractive apt-get install linux-image-4.15.0-123-generic + +DEBIAN_FRONTEND=noninteractive apt full-upgrade + # Adding stretch-backports for lavacli #echo "deb https://apt.lavasoftware.org/release buster-backports main" >> /etc/apt/sources.list diff --git a/packer/provision/agl_hwtest_dependencies.sh b/packer/provision/agl_hwtest_dependencies.sh index 2bd3b9b8..fd1e1fcc 100644 --- a/packer/provision/agl_hwtest_dependencies.sh +++ b/packer/provision/agl_hwtest_dependencies.sh @@ -36,6 +36,11 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \ python3-pip python3-yaml DEBIAN_FRONTEND=noninteractive apt-get clean +DEBIAN_FRONTEND=noninteractive apt-get install linux-image-4.15.0-123-generic + +DEBIAN_FRONTEND=noninteractive apt full-upgrade + + # Adding stretch-backports for lavacli #echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list #DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -t stretch-backports lavacli diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index b34e48cf..45568d3b 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -163,6 +163,7 @@ EOF echo "No extra steps for $FACTER_OS" ;; esac + systemctl disable puppet.service || true } echo "---> Attempting to detect OS" |