diff options
Diffstat (limited to 'packer')
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 53 | ||||
| -rw-r--r-- | packer/provision/basebuild.sh | 12 | ||||
| -rw-r--r-- | packer/provision/baseline.sh | 3 | ||||
| -rwxr-xr-x | packer/start_local_packer.sh | 13 | ||||
| -rw-r--r-- | packer/templates/basebuild-agl-test-slave.json | 2 |
5 files changed, 63 insertions, 20 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index ab0cb7bf..572e1396 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -19,11 +19,9 @@ cat /etc/apt/sources.list echo "---> Removing Vexxhost Ubuntu mirrors" sed -i 's/ubuntu.mirror.vexxhost.com/us.archive.ubuntu.com/g' /etc/apt/sources.list -# UPDATE things +# UPDATE things , jammy throws segfault on do-release-upgrade sed -i -e "s,xenial,focal,g" /etc/apt/sources.list - sync - cat /etc/apt/sources.list DEBIAN_FRONTEND=noninteractive apt-get update @@ -31,27 +29,50 @@ 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 +DEBIAN_FRONTEND=noninteractive apt-get apt-get -y -u dist-upgrade +DEBIAN_FRONTEND=noninteractive apt-get autoremove +DEBIAN_FRONTEND=noninteractive apt-get clean +DEBIAN_FRONTEND=noninteractive dpkg --configure -a +DEBIAN_FRONTEND=noninteractive apt full-upgrade + + +# let the upgrade run anyway +ls -alh /var/run/ +rm -rf /var/run/reboot-requir* +DEBIAN_FRONTEND=noninteractive do-release-upgrade -f DistUpgradeViewNonInteractive --mode=server +DEBIAN_FRONTEND=noninteractive apt-get update +DEBIAN_FRONTEND=noninteractive apt-get autoremove +DEBIAN_FRONTEND=noninteractive apt-get clean + +# again +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 \ libsdl1.2-dev xterm make xsltproc docbook-utils fop dblatex xmlto autoconf automake \ - libtool libglib2.0-dev libarchive-dev python-git git python python-minimal repo \ - tree rsync python-yaml python-requests curl tar docker.io pandoc python3 \ + libtool libglib2.0-dev libarchive-dev git git-all repo \ + tree rsync 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 apt \ + g++-multilib make zip unzip iperf3 \ + debian-keyring debian-archive-keyring python3-yaml python3-pip apt \ liblz4-tool zstd docker.io git diffstat unzip texinfo gcc build-essential \ - chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \ - iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 \ - xterm python3-subunit mesa-common-dev zstd liblz4-tool + chrpath socat cpio python-is-python3 python3 python3-pip python3-pexpect xz-utils debianutils \ + iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \ + xterm python3-subunit mesa-common-dev zstd liblz4-tool default-jre-headless + + DEBIAN_FRONTEND=noninteractive apt-get clean #DEBIAN_FRONTEND=noninteractive apt-get -y install linux-image-4.15.0-123-generic 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 @@ -60,6 +81,7 @@ DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash # add user ubuntu to docker group: sudo usermod -a -G docker ubuntu +sudo usermod -a -G docker jenkins cat <<EOFHOSTS >> /etc/hosts @@ -73,6 +95,9 @@ EOFHOSTS # install newer version of jjb ... fixes issues with rendering sudo pip install --upgrade --force-reinstall -v jenkins-job-builder + + + cat <<EOFSYSCTL >> /etc/sysctl.conf # we have a lot of make jobs, this helps a lot kernel.sched_child_runs_first = 1 @@ -146,6 +171,8 @@ mkdir /w cp -r /home/ubuntu/.ssh/authorized_keys /home/jenkins/.ssh/authorized_keys echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0EqO61Im8/zCKj4Hg/H26Q3Z4UAjlIePVVu54LfbCIJ7wPLNTBBXBz74cTuiUMF8CbeBwOyWR83NELbSllKnr+wK6pv3h6f7Zn54sQBXjIy11K38CdrMdXxaCIIPBGqJvOy2JukdKuuwfTuXjUk57evoXKJH1aw3Vu3+81gvqCdKlzbWlOP1p0MdvsWVRpOMn27IH2Gz4/nDdwWtIF8YFHAIbWmlCZGiv8/i/nyuLfsC7p6p00qHfxO5KFTsstQe+/f8WkGNaY/Vz124PBic51GsJ+2SfEnDvYSaQvjsf+xPsfQ4Bo6xkz75sN3PYuNOGZX2TQom139b2x18XXzgwSzeZwYhPKN511xBFll5/0/SugWWU+7pNtXUrK+1PZ7zshlch/vaIJzeZCYYRim0yUDM6rLiJ/zqMRO5jvPqpnFjZ9Rz+bqPpLC3mMiEWBdbs9Hxtx3+NhrFVBGlDVoi7sBzDKyrSnuljAZHLaT9rxQquhWLKRUjPZviSb8s544WaQmWDyOTWkPXdN63pVM23EAfi1wVRIyPcLZMdoHQohbh+ePclG2pGfV8hro+aDNyvLcXj1wL8p43elV4d/jPjsePqso7IhyPSghhLCO7lLnrlNVBaI5A+/iUILRHU3LlmKJlErwDmkl1XAJbO0DHDpSwsIDrK1q9Eb7e+C6M8Ww==" >> /home/jenkins/.ssh/authorized_keys +echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFPlD8r/AP4CJMwaaiBufxWYBL+H4t2Q7c7uRsFgrRZTPWILayNlUbz2SnJMOGw9/Fxj6pO5DudiV0qp/D9mSb5Ai1u3Fd0Ev7cUKGZ3UlnvLQX6N/42GpshmPbLMEj8GxRK7YgS9B8XgsPZALsoFBTv2PE7984tRO8SOq2Ijh13Vxfh9sz6rPm3sJZJ8zyFOnpBbEPcmN/OkbRQEwcMt1JXw/iEHvo9/pAUHBD9ZF4dAzAym3AqjxwkNy6oFsebdl3Czi41GLX+wj389gAW+YmT5MpHQae4aKkfc+3LkpXY5Od43lOBmBpXWMDV4JxL5Am4BiXQHkRuHr/4a3Q7TEKSpeUmcKusJR4j8hkIwxgqBYLwhJic5GkMrsu+223IH42M+yKXlzij9WBl8YIh1l+lma9ogQknMhb+2yJjiY2eeLAnF31NSA8EiHDQRwvbJBsC4d5RyCFpV3Kd9wX2UzpMfqRIQD7qFDOZzmSGjhLX9jpsQYHhobc/iK//Cy300= dl9pf@legolas" >> /home/jenkins/.ssh/authorized_keys +echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDxIHhWB+wX7j7n3tXH4jfBF0kmPZtjzuudp3jsRTNz1ddL9A6CH6GH+aP+9ps7/y8KQrxzU169b9mDHFM9Wq6hetfFEjJk+4JJLPlHWwznSzDIDz0nTkH9Yp8LvTCjIz1mg9PZsZTM47zxmthhdmVegBbQDEDNBWwdUHiziDF9/4EmDYn+//U9CU8vCuVqM4atnHVtCA+2iVkavvXiEfL75SHmqsB4psRQ1mZOWJkGefJXbh2gkEuuhEno1XW3Txc3Gt/hmzVR4h+2iBuxVcCEFNaKqJhbDOn5nG50rFuZj6gkRbtVnV6XKXI4AznPTuWhPtDTmsBHSAuLx/EiWho69L0Gh3adaSD0o0IvcgzN2m9fmKMLKmDKAlLGVhxZhqIFRiTshw0lTjdrk59TTTXDh6cA4hQ2c20bknXgjdegc0W2ef9fiTFfLKmY5rD2RFvKdGBWlGH8WVU86QzcZeyvFGGHtZ9AgSmIyDpWFwjcCXmxl1okGeBF2pJUovp0SEU= dl9pf@elrond" >> /home/jenkins/.ssh/authorized_keys chmod 0600 /home/jenkins/.ssh/authorized_keys # Generate ssh key for use by Robot jobs diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 08651d16..7c13ae61 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -5,9 +5,21 @@ set -x +mkdir -p /mnt/tank +chown -R jenkins:jenkins /mnt/tank +mkdir -p /mnt/tank2 +chown -R jenkins:jenkins /mnt/tank2 + 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,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/provision/baseline.sh b/packer/provision/baseline.sh index 6854d527..12b3b9a6 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -129,6 +129,9 @@ EOF echo "---> Configuring OpenJDK" apt-get install -y default-jre-headless default-jdk-headless unzip + # install NFS + apt-get install -y nfs-common + } all_systems() { diff --git a/packer/start_local_packer.sh b/packer/start_local_packer.sh index 20e3ef22..e56a628c 100755 --- a/packer/start_local_packer.sh +++ b/packer/start_local_packer.sh @@ -1,11 +1,12 @@ #!/bin/bash - +set -x # -echo "Run: dpkg-reconfigure openssh-server" -echo "Fixup /etc/ssh/sshd_config" -echo "Run: ssh -R HOST:2222:localhost:22 user@10.0.2.2" -echo "Then connect to HOST:2222 with ssh" +#echo "Run: dpkg-reconfigure openssh-server" +#echo "Fixup /etc/ssh/sshd_config" +#echo "Run: ssh -R HOST:2222:localhost:22 user@10.0.2.2" +#echo "Then connect to HOST:2222 with ssh" -qemu-system-x86_64 -vnc :0 -hda output_ubuntu/jenkins-new-test -net nic -net user -serial stdio -accel kvm -smp 2 -m 4096
\ No newline at end of file +#qemu-system-x86_64 -hda output_ubuntu/jenkins-new-test -net nic -net user,hostfwd=tcp:127.0.0.1:60022-:22 -accel kvm -smp 4 -m 8192 -nographic +qemu-system-x86_64 -hda output_ubuntu/jenkins-new-test.raw -hdb output_ubuntu/file.img -net nic -net user,hostfwd=tcp:127.0.0.1:60022-:22 -accel kvm -smp 24 -m 32768 -nographic 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/", |