diff options
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 18 | ||||
| -rw-r--r-- | packer/provision/basebuild.sh | 6 | ||||
| -rw-r--r-- | packer/templates/basebuild-agl-test-slave.json | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index 1c18b89c..9ba48499 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -20,7 +20,7 @@ echo "---> Removing Vexxhost Ubuntu mirrors" sed -i 's/ubuntu.mirror.vexxhost.com/us.archive.ubuntu.com/g' /etc/apt/sources.list # UPDATE things -sed -i -e "s,xenial,focal,g" /etc/apt/sources.list +sed -i -e "s,xenial,jammy,g" /etc/apt/sources.list sync cat /etc/apt/sources.list @@ -29,6 +29,13 @@ DEBIAN_FRONTEND=noninteractive apt-get --purge remove plymouth-theme* plymouth DEBIAN_FRONTEND=noninteractive apt-get autoremove DEBIAN_FRONTEND=noninteractive apt-get apt-get -y -u dist-upgrade DEBIAN_FRONTEND=noninteractive dpkg --configure -a +DEBIAN_FRONTEND=noninteractive apt-get update + +# let the upgrade run anyway +rm -rf /var/run/reboot-requir* + +DEBIAN_FRONTEND=noninteractive do-release-upgrade -f DistUpgradeViewNonInteractive --mode=server + DEBIAN_FRONTEND=noninteractive apt-get update && \ apt-get -y install gawk wget git-core diffstat unzip texinfo gcc-multilib build-essential chrpath socat \ @@ -50,9 +57,9 @@ DEBIAN_FRONTEND=noninteractive apt-get clean DEBIAN_FRONTEND=noninteractive apt full-upgrade -sudo pip3 install --upgrade pip -sudo pip3 install --upgrade --force-reinstall --ignore-installed pyyaml -sudo pip3 install --upgrade --ignore-installed --force-reinstall lavacli==1.0 +#sudo pip3 install --upgrade pip +#sudo pip3 install --upgrade --force-reinstall --ignore-installed pyyaml +#sudo pip3 install --upgrade --ignore-installed --force-reinstall lavacli==1.0 # we have a build blocker wrt useradd - I assume it is caused by /bin/sh being dash # systemd: Performing useradd with @@ -75,10 +82,7 @@ EOFHOSTS # install newer version of jjb ... fixes issues with rendering sudo pip install --upgrade --force-reinstall -v jenkins-job-builder -# let the upgrade run anyway -rm -rf /var/run/reboot-requir* -DEBIAN_FRONTEND=noninteractive do-release-upgrade -f DistUpgradeViewNonInteractive --mode=server cat <<EOFSYSCTL >> /etc/sysctl.conf diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 2d29953c..7c13ae61 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -15,8 +15,10 @@ cat <<EOFSTAB >> /etc/fstab # tmp should be tmpfs so gcc tmpfiles do not hit the disk none /tmp tmpfs defaults 0 0 -10.30.73.73:/srv/tank /mnt/tank nfs vers=3,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr 0 0 -10.30.73.73:/srv/tank /mnt/tank2 nfs vers=3,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr 0 0 +#10.30.73.73:/srv/tank /mnt/tank nfs vers=3,x-systemd.mount-timeout=5,x-systemd.device-timeout=5,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr,_netdev 0 0 +#10.30.73.73:/srv/tank /mnt/tank2 nfs vers=3,x-systemd.mount-timeout=5,x-systemd.device-timeout=5,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr,_netdev 0 0 +10.30.73.73:/srv/tank /mnt/tank nfs auto,vers=3,nofail,noatime,intr,actimeo=1800,async,rsize=8192,wsize=8192,sec=sys,_netdev 0 0 +10.30.73.73:/srv/tank /mnt/tank2 nfs auto,vers=3,nofail,noatime,nolock,intr,tcp,actimeo=1800,_netdev 0 0 # vers=3,auto,nofail,noatime,nolock,intr,tcp,actimeo=1800 EOFSTAB diff --git a/packer/templates/basebuild-agl-test-slave.json b/packer/templates/basebuild-agl-test-slave.json index 930d0d5c..d37e5d27 100644 --- a/packer/templates/basebuild-agl-test-slave.json +++ b/packer/templates/basebuild-agl-test-slave.json @@ -13,7 +13,7 @@ "builders": [ { "name": "vexxhost", - "image_name": "{{user `distro`}} - basebuild-agl-test-slave - {{isotime \"20060102-1504\"}}", + "image_name": "basebuild-agl-test-slave - {{isotime \"20060102-1504\"}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", "identity_endpoint": "https://auth.vexxhost.net/v3/", |