Merge ~paelzer/autopkgtest-cloud:fix-octave-needing-more-than-one-cpu into autopkgtest-cloud:master
- Git
- lp:~paelzer/autopkgtest-cloud
- fix-octave-needing-more-than-one-cpu
- Merge into master
Proposed by
Christian Ehrhardt
Status: | Merged |
---|---|
Merged at revision: | a270fac944eca5ca8ad2a75d5a13cf01b960c798 |
Proposed branch: | ~paelzer/autopkgtest-cloud:fix-octave-needing-more-than-one-cpu |
Merge into: | autopkgtest-cloud:master |
Diff against target: |
116 lines (+9/-9) 9 files modified
worker-config-production/worker-bos01-arm64.conf (+1/-1) worker-config-production/worker-bos01-ppc64el.conf (+1/-1) worker-config-production/worker-bos01-s390x.conf (+1/-1) worker-config-production/worker-bos01.conf (+1/-1) worker-config-production/worker-bos02-arm64.conf (+1/-1) worker-config-production/worker-bos02-ppc64el.conf (+1/-1) worker-config-production/worker-bos02-s390x.conf (+1/-1) worker-config-production/worker-canonistack.conf (+1/-1) worker-config-production/worker.conf (+1/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane | Approve | ||
Review via email: mp+396300@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt (paelzer) wrote : | # |
Revision history for this message
Christian Ehrhardt (paelzer) wrote : | # |
Ok, tried but not working.
We are back at needing this MP to be applied.
Revision history for this message
Iain Lane (laney) wrote : | # |
Thanks. Please keep an eye on the upstream work and let us remove this when possible.
review:
Approve
Revision history for this message
Iain Lane (laney) wrote : | # |
oh, and feel free to retry
Revision history for this message
Christian Ehrhardt (paelzer) wrote : | # |
s390x and amd64 completed and now finally are green.
Two others yet missing, but hopefully good as well.
And yes I'll keep track of this upstream issue..
Thanks Laney
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/worker-config-production/worker-bos01-arm64.conf b/worker-config-production/worker-bos01-arm64.conf |
2 | index 8a62791..24e9e11 100644 |
3 | --- a/worker-config-production/worker-bos01-arm64.conf |
4 | +++ b/worker-config-production/worker-bos01-arm64.conf |
5 | @@ -16,7 +16,7 @@ releases = trusty xenial bionic focal groovy hirsute |
6 | architectures = 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 linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts lintian cl-ironclad samtools mysql-8.0 satpy python-cffi yt scipy skimage node-immutable-tuple node-redis gscan2pdf cwltool multipath-tools tgt dask petsc4py deal.ii |
10 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts lintian cl-ironclad samtools mysql-8.0 satpy python-cffi yt scipy skimage node-immutable-tuple node-redis gscan2pdf cwltool multipath-tools tgt dask petsc4py deal.ii octave-parallel |
11 | long_tests = glibc gutenprint gmp-ecm lintian open-iscsi diffoscope snapcraft snapd cross-toolchain-base automake-1.16 salt epson-inkjet-printer-escpr haveged sshuttle |
12 | blacklist = bionic/arm64/stress-ng bionic/arm64/upstart bionic/arm64/libnih bionic/arm64/r-cran-vioplot bionic/arm64/openjdk-lts focal/arm64/openjdk-lts groovy/arm64/openjdk-lts xenial/arm64/virtualbox-ext-pack bionic/arm64/virtualbox-ext-pack focal/arm64/openjdk-13 groovy/arm64/openjdk-13 focal/arm64/openjdk-14 groovy/arm64/openjdk-14 hirsute/arm64/openjdk-lts hirsute/arm64/openjdk-13 hirsute/arm64/openjdk-14 hirsute/arm64/rust-onig hirsute/arm64/debuerreotype |
13 | |
14 | diff --git a/worker-config-production/worker-bos01-ppc64el.conf b/worker-config-production/worker-bos01-ppc64el.conf |
15 | index f8ecc69..73726a4 100644 |
16 | --- a/worker-config-production/worker-bos01-ppc64el.conf |
17 | +++ b/worker-config-production/worker-bos01-ppc64el.conf |
18 | @@ -16,7 +16,7 @@ releases = trusty xenial bionic focal groovy hirsute |
19 | architectures = ppc64el |
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 linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 makedumpfile samtools satpy python-cffi yt scipy skimage puma cross-toolchain-base cwltool multipath-tools tgt dask petsc4py deal.ii libsis-jhdf5-java |
23 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 makedumpfile samtools satpy python-cffi yt scipy skimage puma cross-toolchain-base cwltool multipath-tools tgt dask petsc4py deal.ii libsis-jhdf5-java octave-parallel |
24 | long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd systemd systemd-upstream cross-toolchain-base |
25 | blacklist = bionic/ppc64el/stress-ng bionic/ppc64el/upstart bionic/ppc64el/libnih bionic/ppc64el/r-cran-vioplot bionic/ppc64el/openjdk-lts xenial/ppc64el/virtualbox-ext-pack bionic/ppc64el/virtualbox-ext-pack hirsute/ppc64el/rust-onig hirsute/ppc64el/debuerreotype |
26 | |
27 | diff --git a/worker-config-production/worker-bos01-s390x.conf b/worker-config-production/worker-bos01-s390x.conf |
28 | index b64ec73..4218acc 100644 |
29 | --- a/worker-config-production/worker-bos01-s390x.conf |
30 | +++ b/worker-config-production/worker-bos01-s390x.conf |
31 | @@ -16,7 +16,7 @@ releases = trusty xenial bionic focal groovy hirsute |
32 | architectures = s390x |
33 | setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh |
34 | setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed |
35 | -big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 samtools satpy python-cffi yt scipy multipath-tools tgt dask deal.ii |
36 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 samtools satpy python-cffi yt scipy multipath-tools tgt dask deal.ii octave-parallel |
37 | long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base |
38 | blacklist = bionic/s390x/stress-ng bionic/s390x/upstart bionic/s390x/libnih bionic/s390x/r-cran-vioplot bionic/s390x/openjdk-lts xenial/s390x/virtualbox-ext-pack bionic/s390x/virtualbox-ext-pack hirsute/s390x/rust-onig hirsute/s390x/debuerreotype |
39 | |
40 | diff --git a/worker-config-production/worker-bos01.conf b/worker-config-production/worker-bos01.conf |
41 | index 850b4ef..82ff35e 100644 |
42 | --- a/worker-config-production/worker-bos01.conf |
43 | +++ b/worker-config-production/worker-bos01.conf |
44 | @@ -16,7 +16,7 @@ releases = trusty xenial bionic focal groovy hirsute |
45 | architectures = ppc64el |
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 linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 samtools satpy python-cffi yt skimage multipath-tools tgt dask |
49 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 samtools satpy python-cffi yt skimage multipath-tools tgt dask octave-parallel |
50 | long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base |
51 | blacklist = bionic/ppc64el/stress-ng bionic/ppc64el/upstart bionic/ppc64el/libnih bionic/ppc64el/r-cran-vioplot bionic/ppc64el/openjdk-lts hirsute/ppc64el/rust-onig |
52 | |
53 | diff --git a/worker-config-production/worker-bos02-arm64.conf b/worker-config-production/worker-bos02-arm64.conf |
54 | index dc2ccdc..6ce2a06 100644 |
55 | --- a/worker-config-production/worker-bos02-arm64.conf |
56 | +++ b/worker-config-production/worker-bos02-arm64.conf |
57 | @@ -16,7 +16,7 @@ releases = trusty xenial bionic focal groovy hirsute |
58 | architectures = arm64 |
59 | setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh |
60 | setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed |
61 | -big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts lintian cl-ironclad samtools mysql-8.0 satpy python-cffi yt scipy skimage node-immutable-tuple node-redis gscan2pdf cwltool multipath-tools tgt dask petsc4py deal.ii |
62 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts lintian cl-ironclad samtools mysql-8.0 satpy python-cffi yt scipy skimage node-immutable-tuple node-redis gscan2pdf cwltool multipath-tools tgt dask petsc4py deal.ii octave-parallel |
63 | long_tests = glibc gutenprint gmp-ecm lintian open-iscsi diffoscope snapcraft snapd cross-toolchain-base automake-1.16 salt epson-inkjet-printer-escpr haveged sshuttle |
64 | blacklist = bionic/arm64/stress-ng bionic/arm64/upstart bionic/arm64/libnih bionic/arm64/r-cran-vioplot bionic/arm64/openjdk-lts focal/arm64/openjdk-lts groovy/arm64/openjdk-lts xenial/arm64/virtualbox-ext-pack bionic/arm64/virtualbox-ext-pack focal/arm64/openjdk-13 focal/arm64/openjdk-13 focal/arm64/openjdk-14 focal/arm64/openjdk-14 hirsute/arm64/openjdk-lts hirsute/arm64/openjdk-13 hirsute/arm64/openjdk-14 hirsute/arm64/rust-onig hirsute/arm64/debuerreotype |
65 | |
66 | diff --git a/worker-config-production/worker-bos02-ppc64el.conf b/worker-config-production/worker-bos02-ppc64el.conf |
67 | index 3888494..a95a105 100644 |
68 | --- a/worker-config-production/worker-bos02-ppc64el.conf |
69 | +++ b/worker-config-production/worker-bos02-ppc64el.conf |
70 | @@ -16,7 +16,7 @@ releases = trusty xenial bionic focal groovy hirsute |
71 | architectures = ppc64el |
72 | setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh |
73 | setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed |
74 | -big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 pandas makedumpfile samtools satpy python-cffi yt scipy skimage puma cross-toolchain-base cwltool multipath-tools tgt dask petsc4py deal.ii libsis-jhdf5-java |
75 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 pandas makedumpfile samtools satpy python-cffi yt scipy skimage puma cross-toolchain-base cwltool multipath-tools tgt dask petsc4py deal.ii libsis-jhdf5-java octave-parallel |
76 | long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd systemd systemd-upstream cross-toolchain-base |
77 | blacklist = bionic/ppc64el/stress-ng bionic/ppc64el/upstart bionic/ppc64el/libnih bionic/ppc64el/r-cran-vioplot bionic/ppc64el/openjdk-lts xenial/ppc64el/virtualbox-ext-pack bionic/ppc64el/virtualbox-ext-pack hirsute/ppc64el/rust-onig hirsute/ppc64el/debuerreotype |
78 | |
79 | diff --git a/worker-config-production/worker-bos02-s390x.conf b/worker-config-production/worker-bos02-s390x.conf |
80 | index b64ec73..4218acc 100644 |
81 | --- a/worker-config-production/worker-bos02-s390x.conf |
82 | +++ b/worker-config-production/worker-bos02-s390x.conf |
83 | @@ -16,7 +16,7 @@ releases = trusty xenial bionic focal groovy hirsute |
84 | architectures = s390x |
85 | setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh |
86 | setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed |
87 | -big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 samtools satpy python-cffi yt scipy multipath-tools tgt dask deal.ii |
88 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 samtools satpy python-cffi yt scipy multipath-tools tgt dask deal.ii octave-parallel |
89 | long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft snapd cross-toolchain-base |
90 | blacklist = bionic/s390x/stress-ng bionic/s390x/upstart bionic/s390x/libnih bionic/s390x/r-cran-vioplot bionic/s390x/openjdk-lts xenial/s390x/virtualbox-ext-pack bionic/s390x/virtualbox-ext-pack hirsute/s390x/rust-onig hirsute/s390x/debuerreotype |
91 | |
92 | diff --git a/worker-config-production/worker-canonistack.conf b/worker-config-production/worker-canonistack.conf |
93 | index cf6fec2..2922395 100644 |
94 | --- a/worker-config-production/worker-canonistack.conf |
95 | +++ b/worker-config-production/worker-canonistack.conf |
96 | @@ -17,7 +17,7 @@ releases = trusty xenial |
97 | architectures = i386 amd64 |
98 | setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh |
99 | setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed |
100 | -big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph botch mathicgb ganeti lttng-modules python2.7 python3.6 python3.7 python3.8 python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 samtools satpy python-cffi yt multipath-tools tgt dask mariadb-10.3 mariadb-10.5 |
101 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-cran-igraph botch mathicgb ganeti lttng-modules python2.7 python3.6 python3.7 python3.8 python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 samtools satpy python-cffi yt multipath-tools tgt dask mariadb-10.3 mariadb-10.5 octave-parallel |
102 | long_tests = gutenprint gmp-ecm open-iscsi diffoscope |
103 | |
104 | [virt] |
105 | diff --git a/worker-config-production/worker.conf b/worker-config-production/worker.conf |
106 | index d9c1961..27a06b8 100644 |
107 | --- a/worker-config-production/worker.conf |
108 | +++ b/worker-config-production/worker.conf |
109 | @@ -16,7 +16,7 @@ releases = precise trusty xenial bionic focal groovy hirsute |
110 | architectures = i386 amd64 |
111 | setup_command = $AUTOPKGTEST_CLOUD_DIR/worker-config-production/setup-canonical.sh |
112 | setup_command2 = $CHECKOUTDIR/setup-commands/setup-testbed |
113 | -big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python2.7 python3.6 python3.7 python3.8 python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 nodejs cl-ironclad python-scipy scipy cross-toolchain-base-mipsen mkl-dnn samtools satpy python-cffi yt skimage scikit-learn silx statsmodels puma multipath-tools tgt dask assimp mariadb-10.3 mariadb-10.5 deal.ii libsis-jhdf5-java |
114 | +big_packages = binutils chromium-browser glibc libreoffice linux linux-* tdb firefox akonadi julia meson python-cryptography python-dmsh pyresample libtext-bidi-perl python-hypothesis nova rocs camitk kineticstools r-bioc-variantannotation r-cran-igraph botch mathicgb ganeti lttng-modules python2.7 python3.6 python3.7 python3.8 python-ruffus openjdk-8 openjdk-lts openjdk-13 openjdk-14 nodejs cl-ironclad python-scipy scipy cross-toolchain-base-mipsen mkl-dnn samtools satpy python-cffi yt skimage scikit-learn silx statsmodels puma multipath-tools tgt dask assimp mariadb-10.3 mariadb-10.5 deal.ii libsis-jhdf5-java octave-parallel |
115 | long_tests = gutenprint gmp-ecm open-iscsi diffoscope snapcraft cross-toolchain-base mercurial |
116 | blacklist = bionic/i386/upstart bionic/amd64/upstart bionic/i386/libnih bionic/amd64/libnih bionic/i386/r-cran-vioplot bionic/amd64/r-cran-vioplot bionic/amd64/stress-ng bionic/i386/stress-ng bionic/i386/openjdk-lts xenial/amd64/virtualbox-ext-pack bionic/amd64/virtualbox-ext-pack xenial/i386/virtualbox-ext-pack bionic/i386/virtualbox-ext-pack hirsute/i386/rust-onig hirsute/amd64/rust-onig |
117 |
Oh, hold it - there might be an upstream fix that I want to try before we mark it big.