Merge ~juliank/autopkgtest-cloud:bos01-bringup into autopkgtest-cloud:master

[Julian Andres Klode]

Bringup of bos01

Bring up bos01, might be incomplete.

[Iain Lane (laney)]

thanks

we really should do something about all this duplication in the conf files...

review: Approve

diff --git a/deployment/charms/xenial/autopkgtest-cloud-worker/hooks/config-changed b/deployment/charms/xenial/autopkgtest-cloud-worker/hooks/config-changed
index 51e0529..dbf2cd3 100755
--- a/deployment/charms/xenial/autopkgtest-cloud-worker/hooks/config-changed
+++ b/deployment/charms/xenial/autopkgtest-cloud-worker/hooks/config-changed
@@ -51,8 +51,12 @@ systemctl disable autopkgtest@.service
 for rcfile in ~ubuntu/*.rc; do
     [ -r $rcfile ] || continue
     region=$(basename $rcfile .rc)
-    if [ "${region#bos01}" != "$region" ]; then
-        num_workers=0
+    if [ "${region#bos01-arm64}" != "$region" ]; then
+        num_workers=3
+    elif [ "${region#bos01-s390x}" != "$region" ]; then
+        num_workers=16
+    elif [ "${region#bos01-ppc64el}" != "$region" ]; then
+        num_workers=5
     elif [ "${region#bos02-arm64}" != "$region" ]; then
         num_workers=30
     elif [ "${region#bos02-s390x}" != "$region" ]; then
diff --git a/tools/build-adt-image-all-clouds b/tools/build-adt-image-all-clouds
index 8beeae8..5aace7b 100755
--- a/tools/build-adt-image-all-clouds
+++ b/tools/build-adt-image-all-clouds
@@ -22,11 +22,6 @@ do_one_cloud() {
             ARCHES="${CLOUD#*-}"
     fi
     for arch in $ARCHES; do
-        case $CLOUD:$arch in
-            bos0*:i386|bos0*:amd64|bos01:arm64)
-                continue
-                ;;
-        esac
         IMG=$(echo "$IMGS" | grep "${RELEASE}-daily-${arch}" | tail -n1 | awk '{print $2}')
         if [ -n "$IMG" ]; then
             # We have a daily: check if we need to rebuild the image (i.e. if the daily is newer than our adt-generated one)
diff --git a/worker-config-production/worker-bos01-arm64.conf b/worker-config-production/worker-bos01-arm64.conf
new file mode 100644
index 0000000..effc58f
--- /dev/null
+++ b/worker-config-production/worker-bos01-arm64.conf
@@ -0,0 +1,28 @@
+[amqp]
+host = #RABBITHOST#
+user = #RABBITUSER#
+password = #RABBITPASSWORD#
+
+[swift]
+region_name = bootstack-ps45
+auth_url = http://10.24.0.132:5000/v2.0/
+username = prod-ues-proposed-migration
+tenant = prod-ues-proposed-migration_project
+password = #SWIFTPASSWORD#
+
+[autopkgtest]
+checkout_dir = /home/ubuntu/autopkgtest
+releases = trusty xenial artful bionic cosmic
+architectures = arm64
+setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
+setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
+big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia python-cryptography libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph botch mathicgb ganeti lttng-modules
+long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd
+blacklist = artful/arm64/stress-ng artful/arm64/upstart artful/arm64/libnih bionic/arm64/stress-ng bionic/arm64/upstart bionic/arm64/libnih bionic/arm64/r-cran-vioplot cosmic/arm64/stress-ng cosmic/arm64/upstart cosmic/arm64/libnih cosmic/arm64/r-cran-vioplot
+
+
+[virt]
+# flavors
+package_size_default = autopkgtest
+package_size_big = m1.large
+args = ssh -s $CHECKOUTDIR/ssh-setup/nova -- --nova-reboot --flavor $PACKAGESIZE --security-groups $SECGROUP --name adt-$RELEASE-$ARCHITECTURE-$PACKAGENAME-$TIMESTAMP --image adt/ubuntu-$RELEASE-$ARCHITECTURE-server-.* --keyname #KEYNAME# --net-id=net_ues_proposed_migration -e 'http_proxy=http://squid.internal:3128' -e 'https_proxy=http://squid.internal:3128' -e 'no_proxy=127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,archive.ubuntu.com,security.ubuntu.com,changelogs.ubuntu.com,ddebs.ubuntu.com,ppa.launchpad.net' --mirror=http://ftpmaster.internal/ubuntu
diff --git a/worker-config-production/worker-bos01-ppc64el.conf b/worker-config-production/worker-bos01-ppc64el.conf
new file mode 100644
index 0000000..241a65e
--- /dev/null
+++ b/worker-config-production/worker-bos01-ppc64el.conf
@@ -0,0 +1,27 @@
+[amqp]
+host = #RABBITHOST#
+user = #RABBITUSER#
+password = #RABBITPASSWORD#
+
+[swift]
+region_name = bootstack-ps45
+auth_url = http://10.24.0.132:5000/v2.0/
+username = prod-ues-proposed-migration
+tenant = prod-ues-proposed-migration_project
+password = #SWIFTPASSWORD#
+
+[autopkgtest]
+checkout_dir = /home/ubuntu/autopkgtest
+releases = trusty xenial artful bionic cosmic
+architectures = ppc64el
+setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
+setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
+big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia python-cryptography libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph botch mathicgb ganeti lttng-modules
+long_tests = gutenprint gmp-ecm open-iscsi diffoscope
+blacklist = artful/ppc64el/stress-ng artful/ppc64el/upstart artful/ppc64el/libnih bionic/ppc64el/stress-ng bionic/ppc64el/upstart bionic/ppc64el/libnih bionic/ppc64el/r-cran-vioplot cosmic/ppc64el/stress-ng cosmic/ppc64el/upstart cosmic/ppc64el/libnih cosmic/ppc64el/r-cran-vioplot
+
+[virt]
+# flavors
+package_size_default = autopkgtest
+package_size_big = m1.large
+args = ssh -s $CHECKOUTDIR/ssh-setup/nova -- --nova-reboot --flavor $PACKAGESIZE --security-groups $SECGROUP --name adt-$RELEASE-$ARCHITECTURE-$PACKAGENAME-$TIMESTAMP --image adt/ubuntu-$RELEASE-$ARCHITECTURE-server --keyname #KEYNAME# --net-id=net_ues_proposed_migration -e 'http_proxy=http://squid.internal:3128' -e 'https_proxy=http://squid.internal:3128' -e 'no_proxy=127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,archive.ubuntu.com,security.ubuntu.com,changelogs.ubuntu.com,ddebs.ubuntu.com,ppa.launchpad.net' --mirror=http://ftpmaster.internal/ubuntu
diff --git a/worker-config-production/worker-bos01-s390x.conf b/worker-config-production/worker-bos01-s390x.conf
new file mode 100644
index 0000000..603e296
--- /dev/null
+++ b/worker-config-production/worker-bos01-s390x.conf
@@ -0,0 +1,28 @@
+[amqp]
+host = #RABBITHOST#
+user = #RABBITUSER#
+password = #RABBITPASSWORD#
+
+[swift]
+region_name = bootstack-ps45
+auth_url = http://10.24.0.132:5000/v2.0/
+username = prod-ues-proposed-migration
+tenant = prod-ues-proposed-migration_project
+password = #SWIFTPASSWORD#
+
+[autopkgtest]
+checkout_dir = /home/ubuntu/autopkgtest
+releases = xenial artful bionic cosmic
+architectures = s390x
+setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
+setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
+big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia python-cryptography libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph botch mathicgb ganeti lttng-modules
+long_tests = gutenprint gmp-ecm open-iscsi diffoscope
+blacklist = artful/s390x/stress-ng artful/s390x/upstart artful/s390x/libnih bionic/s390x/stress-ng bionic/s390x/upstart bionic/s390x/libnih bionic/s390x/r-cran-vioplot cosmic/s390x/stress-ng cosmic/s390x/upstart cosmic/s390x/libnih cosmic/s390x/r-cran-vioplot
+
+
+[virt]
+# flavors
+package_size_default = autopkgtest
+package_size_big = m1.large
+args = ssh -s $CHECKOUTDIR/ssh-setup/nova -- --nova-reboot --flavor $PACKAGESIZE --security-groups $SECGROUP --name adt-$RELEASE-$ARCHITECTURE-$PACKAGENAME-$TIMESTAMP --image adt/ubuntu-$RELEASE-$ARCHITECTURE-server-.* --keyname #KEYNAME# --net-id=net_ues_proposed_migration -e 'http_proxy=http://squid.internal:3128' -e 'https_proxy=http://squid.internal:3128' -e 'no_proxy=127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,archive.ubuntu.com,security.ubuntu.com,changelogs.ubuntu.com,ddebs.ubuntu.com,ppa.launchpad.net' --mirror=http://ftpmaster.internal/ubuntu