autopkgtest-cloud

Merge ~rbalint/autopkgtest-cloud:master into autopkgtest-cloud:master

  1. Git
  2. lp:~rbalint/autopkgtest-cloud
  3. master
  4. Merge into master
Proposed by Balint Reczey on 2017-04-12
Status: Merged
Approved by: Andy Whitcroft on 2017-04-12
Approved revision: f61fe43f3c567ac9717f54c528ac9365d404e88c
Merge reported by: Andy Whitcroft
Merged at revision: not available
Proposed branch: ~rbalint/autopkgtest-cloud:master
Merge into: autopkgtest-cloud:master
Diff against target: 64 lines (+5/-5)
5 files modified
worker-config-production/worker-bos01.conf (+1/-1)
worker-config-production/worker-canonistack.conf (+1/-1)
worker-config-production/worker-lxd.conf (+1/-1)
worker-config-production/worker.conf (+1/-1)
worker/worker.conf (+1/-1)
Reviewer Review Type Date Requested Status
Andy Whitcroft 2017-04-12 Approve on 2017-04-12
Review via email: mp+322430@code.launchpad.net

Commit Message

Both botch and mathicgb require large instances.

To post a comment you must log in.
Andy Whitcroft (apw) wrote :

Looks good to me.

review: Approve
Andy Whitcroft (apw) wrote :

Merged and rolled out.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/worker-config-production/worker-bos01.conf b/worker-config-production/worker-bos01.conf
2index bfbaf79..34706b5 100644
3--- a/worker-config-production/worker-bos01.conf
4+++ b/worker-config-production/worker-bos01.conf
5@@ -16,7 +16,7 @@ releases = trusty vivid xenial yakkety zesty
6 architectures = ppc64el arm64
7 setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
8 setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
9-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
10+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
11 long_tests = gutenprint gmp-ecm open-iscsi diffoscope
12 blacklist = vivid/ppc64el/systemd vivid/ppc64el/network-manager yakkety/ppc64el/stress-ng yakkety/ppc64el/upstart yakkety/ppc64el/libnih zesty/ppc64el/stress-ng zesty/ppc64el/upstart zesty/ppc64el/libnih
13
14diff --git a/worker-config-production/worker-canonistack.conf b/worker-config-production/worker-canonistack.conf
15index 038d91a..afcba61 100644
16--- a/worker-config-production/worker-canonistack.conf
17+++ b/worker-config-production/worker-canonistack.conf
18@@ -17,7 +17,7 @@ releases = trusty xenial
19 architectures = i386 amd64
20 setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
21 setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
22-big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph
23+big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph botch mathicgb
24 long_tests = gutenprint gmp-ecm open-iscsi diffoscope
25
26 [virt]
27diff --git a/worker-config-production/worker-lxd.conf b/worker-config-production/worker-lxd.conf
28index b090b38..e805d06 100644
29--- a/worker-config-production/worker-lxd.conf
30+++ b/worker-config-production/worker-lxd.conf
31@@ -16,7 +16,7 @@ releases = precise trusty vivid xenial yakkety zesty
32 architectures = $LXD_ARCH
33 setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
34 setup_command2 = sed -i "s/ports.ubuntu.com/ftpmaster.internal/; s/ubuntu-ports/ubuntu/" /etc/apt/sources.list `ls /etc/apt/sources.list.d/*.list 2>/dev/null || true`; ln -s /dev/null /etc/systemd/system/bluetooth.service; printf "http_proxy=http://squid.internal:3128\nhttps_proxy=http://squid.internal:3128\nno_proxy=127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,archive.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpad.net,10.24.0.0/24\n" >> /etc/environment
35-big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph
36+big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph botch mathicgb
37 long_tests = gutenprint gmp-ecm open-iscsi diffoscope
38 blacklist = xenial/armhf/libnih yakkety/armhf/libnih zesty/armhf/libnih
39
40diff --git a/worker-config-production/worker.conf b/worker-config-production/worker.conf
41index 3fcf8a6..230c16e 100644
42--- a/worker-config-production/worker.conf
43+++ b/worker-config-production/worker.conf
44@@ -16,7 +16,7 @@ releases = precise trusty vivid xenial yakkety zesty
45 architectures = i386 amd64
46 setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
47 setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
48-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
49+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
50 long_tests = gutenprint gmp-ecm open-iscsi diffoscope
51 blacklist = vivid/ppc64el/systemd vivid/ppc64el/network-manager yakkety/i386/upstart yakkety/amd64/upstart yakkety/i386/libnih yakkety/amd64/libnih zesty/i386/upstart zesty/amd64/upstart zesty/i386/libnih zesty/amd64/libnih
52
53diff --git a/worker/worker.conf b/worker/worker.conf
54index b7524bb..ba16b31 100644
55--- a/worker/worker.conf
56+++ b/worker/worker.conf
57@@ -17,7 +17,7 @@ releases = trusty xenial
58 architectures = i386 amd64
59 setup_command =
60 # setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
61-big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia libtext-bidi-perl rocs camitk kineticstools r-cran-igraph
62+big_packages = binutils chromium-browser glibc libreoffice linux tdb firefox akonadi julia libtext-bidi-perl rocs camitk kineticstools r-cran-igraph botch mathicgb
63 long_tests = gutenprint gmp-ecm open-iscsi
64 blacklist =
65

Subscribers

People subscribed via source and target branches