autopkgtest-cloud

Merge ~juliank/autopkgtest-cloud:salt-long into autopkgtest-cloud:master

  1. Git
  2. lp:~juliank/autopkgtest-cloud
  3. salt-long
  4. Merge into master
Proposed by Julian Andres Klode
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 5328c30266e06eed997873ed5dba1755c8f5686c
Merged at revision: 5328c30266e06eed997873ed5dba1755c8f5686c
Proposed branch: ~juliank/autopkgtest-cloud:salt-long
Merge into: autopkgtest-cloud:master
Diff against target: 39 lines (+3/-3)
3 files modified
worker-config-production/worker-bos01-arm64.conf (+1/-1)
worker-config-production/worker-bos02-arm64.conf (+1/-1)
worker-config-production/worker-lxd.conf (+1/-1)
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+362292@code.launchpad.net

Description of the change

Add salt to long tests on arm*, it mostly times out now

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

From what I see in the ADT logs, this change makes sense. +1

review: Approve

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-arm64.conf b/worker-config-production/worker-bos01-arm64.conf
2index 8373141..c1be82b 100644
3--- a/worker-config-production/worker-bos01-arm64.conf
4+++ b/worker-config-production/worker-bos01-arm64.conf
5@@ -17,7 +17,7 @@ architectures = arm64
6 setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
7 setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
8 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 python-ruffus openjdk-8 openjdk-lts
9-long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base automake-1.16
10+long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base automake-1.16 salt
11 blacklist = 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 disco/arm64/stress-ng disco/arm64/upstart disco/arm64/libnih disco/arm64/r-cran-vioplot bionic/arm64/openjdk-lts cosmic/arm64/openjdk-lts disco/arm64/openjdk-lts
12
13 [virt]
14diff --git a/worker-config-production/worker-bos02-arm64.conf b/worker-config-production/worker-bos02-arm64.conf
15index 8373141..c1be82b 100644
16--- a/worker-config-production/worker-bos02-arm64.conf
17+++ b/worker-config-production/worker-bos02-arm64.conf
18@@ -17,7 +17,7 @@ architectures = arm64
19 setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
20 setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed
21 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 python-ruffus openjdk-8 openjdk-lts
22-long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base automake-1.16
23+long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base automake-1.16 salt
24 blacklist = 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 disco/arm64/stress-ng disco/arm64/upstart disco/arm64/libnih disco/arm64/r-cran-vioplot bionic/arm64/openjdk-lts cosmic/arm64/openjdk-lts disco/arm64/openjdk-lts
25
26 [virt]
27diff --git a/worker-config-production/worker-lxd.conf b/worker-config-production/worker-lxd.conf
28index 7d02361..2d6ad06 100644
29--- a/worker-config-production/worker-lxd.conf
30+++ b/worker-config-production/worker-lxd.conf
31@@ -17,7 +17,7 @@ architectures = $LXD_ARCH
32 setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh
33 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
34 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 ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts
35-long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base automake-1.16 mercurial
36+long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base automake-1.16 mercurial salt
37 blacklist = xenial/armhf/libnih artful/armhf/libnih bionic/armhf/libnih bionic/armhf/r-cran-vioplot cosmic/armhf/r-cran-vioplot disco/armhf/r-cran-vioplot bionic/armhf/openjdk-lts cosmic/armhf/openjdk-lts disco/armhf-openjdk-lts
38
39 [virt]

Subscribers

People subscribed via source and target branches