* [OSSTEST PATCH v12 01/21] ts-openstack-deploy: Deploy OpenStack on a host with devstack
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 02/21] ts-openstack-tempest: Run Tempest to check OpenStack Anthony PERARD
` (19 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
This script installs any necessary packages and clones all of the OpenStack
trees which are used by devstack to deploy OpenStack.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
sg-run-job | 5 ++
ts-openstack-deploy | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 153 insertions(+)
create mode 100755 ts-openstack-deploy
diff --git a/sg-run-job b/sg-run-job
index b1f94f4..6092384 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -629,6 +629,11 @@ proc run-job/test-rumprun {} {
ts-guest-destroy-hard host $g +
}
+proc need-hosts/test-devstack {} { return host }
+proc run-job/test-devstack {} {
+ run-ts . = ts-openstack-deploy + host
+}
+
if {[file exists sg-run-job-adhoc]} {
source sg-run-job-adhoc
}
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
new file mode 100755
index 0000000..6f061eb
--- /dev/null
+++ b/ts-openstack-deploy
@@ -0,0 +1,148 @@
+#!/usr/bin/perl
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2016 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict qw(vars);
+use Osstest;
+use Osstest::TestSupport;
+use Osstest::BuildSupport;
+
+tsreadconfig();
+our ($whhost) = @ARGV;
+$whhost ||= 'host';
+our $ho = selecthost($whhost);
+our $builddir = target_jobdir($ho);
+
+sub packages () {
+ target_install_packages($ho, qw(git sudo));
+}
+sub checkout () {
+ prepbuilddirs();
+ build_clone($ho, 'openstack_cinder', $builddir, 'cinder');
+ build_clone($ho, 'openstack_devstack', $builddir, 'devstack');
+ build_clone($ho, 'openstack_glance', $builddir, 'glance');
+ build_clone($ho, 'openstack_keystone', $builddir, 'keystone');
+ build_clone($ho, 'openstack_nova', $builddir, 'nova');
+ build_clone($ho, 'openstack_requirements', $builddir, 'requirements');
+ build_clone($ho, 'openstack_tempest', $builddir, 'tempest');
+
+ my $vg = target_choose_vg($ho, 10*1024); # 10GB
+ target_putfilecontents_stash($ho, 60,
+ <<END, $builddir.'/devstack/local.conf');
+[[local|localrc]]
+# Everything should be cloned by osstest, so devstack don't have to do it
+ERROR_ON_CLONE=True
+USE_SCREEN=False
+ADMIN_PASSWORD=secretadmin
+DATABASE_PASSWORD=secretdatabase
+RABBIT_PASSWORD=secretrabbit
+SERVICE_PASSWORD=secretservice
+SERVICE_TOKEN=atokenserviced
+# make it small because there is no way to not have this lvm volume created
+VOLUME_BACKING_FILE_SIZE=50M
+CINDER_LVM_TYPE=default
+DEST=$builddir
+DATA_DIR=\$DEST/data
+SERVICE_DIR=\$DEST/status
+SUBUNIT_OUTPUT=\$DEST/devstack.subunit
+LOGFILE=\$DEST/logs/stack.sh.log
+LOG_COLOR=False
+LIBVIRT_TYPE=xen
+disable_service horizon
+disable_service n-novnc
+disable_service dstat
+# Disable neutron and switch back to nova-network
+disable_service q-svc
+disable_service q-dhcp
+disable_service q-meta
+disable_service q-agt
+disable_service q-l3
+enable_service n-net
+[[post-config|\$CINDER_CONF]]
+[lvmdriver-1]
+volume_group = $vg
+END
+
+ # libvirt is already installed, but not as a package, so avoid installation
+ # of the libvirt package with devstack
+ # https://bugs.launchpad.net/devstack/+bug/1641144
+ target_editfile($ho, "$builddir/devstack/files/debs/nova", sub {
+ while (<EI>) {
+ next if m/.*libvirt.*/;
+ print EO or die $!;
+ }
+ });
+ target_editfile($ho,
+ "$builddir/devstack/lib/nova_plugins/functions-libvirt",
+ sub {
+ while (<EI>) {
+ if (m/install_package.*libvirt.*/) {
+ s#install_package.*#:#
+ }
+ print EO or die $!;
+ }
+ }
+ );
+
+ # Package python-systemd does not exist in Debian installed by osstest
+ target_editfile($ho, "$builddir/devstack/files/debs/general", sub {
+ while (<EI>) {
+ next if m/^python-systemd$/;
+ print EO or die $!;
+ }
+ });
+
+ # devstack blindly assume that systemd is used if systemctl is present
+ # https://bugs.launchpad.net/devstack/+bug/1641112
+ target_editfile($ho, "$builddir/devstack/functions-common", sub {
+ while (<EI>) {
+ if (m#\[ -x /bin/systemctl#) {
+ s#\[ -x /bin/systemctl \]#false#
+ }
+ print EO or die $!;
+ }
+ });
+
+ # OpenStack needs access to libvirt from a user.
+ target_cmd_root($ho, <<END);
+ set -e
+ addgroup --system libvirt
+ cat >> /etc/libvirt/libvirtd.conf <<EOF
+unix_sock_group = "libvirt"
+unix_sock_ro_perms = "0777"
+unix_sock_rw_perms = "0770"
+EOF
+ service libvirtd restart
+END
+
+ # devstack is going to setup the host, install some dependency.
+ target_putfilecontents_root_stash($ho, 100,
+ <<END, "/etc/sudoers.d/devstack");
+osstest ALL=(ALL) NOPASSWD:ALL
+END
+}
+
+sub deploy() {
+ target_cmd($ho, <<END, 1800);
+ set -e
+ cd $builddir/devstack
+ ./stack.sh
+END
+}
+
+packages();
+checkout();
+deploy();
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 02/21] ts-openstack-tempest: Run Tempest to check OpenStack
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 01/21] ts-openstack-deploy: Deploy OpenStack on a host with devstack Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 03/21] ts-openstack-deploy: Set http proxy Anthony PERARD
` (18 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
This script runs the OpenStack integration test suite, Tempest.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
sg-run-job | 1 +
ts-openstack-tempest | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+)
create mode 100755 ts-openstack-tempest
diff --git a/sg-run-job b/sg-run-job
index 6092384..5f15821 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -632,6 +632,7 @@ proc run-job/test-rumprun {} {
proc need-hosts/test-devstack {} { return host }
proc run-job/test-devstack {} {
run-ts . = ts-openstack-deploy + host
+ run-ts . = ts-openstack-tempest + host
}
if {[file exists sg-run-job-adhoc]} {
diff --git a/ts-openstack-tempest b/ts-openstack-tempest
new file mode 100755
index 0000000..82e9a71
--- /dev/null
+++ b/ts-openstack-tempest
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2016 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict qw(vars);
+use Osstest;
+use Osstest::TestSupport;
+use Osstest::BuildSupport;
+
+tsreadconfig();
+our ($whhost) = @ARGV;
+$whhost ||= 'host';
+our $ho = selecthost($whhost);
+our $builddir = target_jobdir($ho);
+
+sub tempest() {
+ my @ignored_tests;
+ my $scenario = 'tempest.scenario';
+ my $volume_boot_pattern =
+ "$scenario.test_volume_boot_pattern.TestVolumeBootPattern";
+ my $shelve_instance = "$scenario.test_shelve_instance.TestShelveInstance";
+
+ # Ignore tests which try to boot a guest with /dev/vda as boot device name.
+ push @ignored_tests,
+ "^\Q$volume_boot_pattern.test_volume_boot_pattern\E";
+ push @ignored_tests,
+ "^\Q$volume_boot_pattern.test_create_ebs_image_and_check_boot\E";
+ push @ignored_tests,
+ "^\Q$shelve_instance.test_shelve_volume_backed_instance\E";
+
+ # Those tests access a volume through iSCSI. This does not work when both
+ # the server and client of iSCSI are on the same Xen host (both in dom0),
+ # Linux 4.0 is the first Linux to have a fix.
+ push @ignored_tests,
+ "^\Q${volume_boot_pattern}V2.test_volume_boot_pattern\E";
+ push @ignored_tests,
+ "^\Q${volume_boot_pattern}V2.test_create_ebs_image_and_check_boot\E";
+
+ # This regex below select the tests to run and exclude the ones marked as
+ # slow as well as the explicit tests listed above. It is based on the one
+ # that can be found in tempest.git/tox.ini in the section [testenv:full].
+ my $ignored_tests = join("|", @ignored_tests);
+ my $regex = "(?!.*\\[.*\\bslow\\b.*\\]|$ignored_tests)".
+ "(^tempest\\.(api|scenario|thirdparty))";
+
+ target_cmd($ho, <<END, 7200);
+set -e
+$builddir/tempest/run_tempest.sh --virtual-env -- --concurrency=2 '$regex'
+END
+}
+
+tempest();
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 03/21] ts-openstack-deploy: Set http proxy
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 01/21] ts-openstack-deploy: Deploy OpenStack on a host with devstack Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 02/21] ts-openstack-tempest: Run Tempest to check OpenStack Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 04/21] TestSupport: provide target_https_mitm_proxy_cert_path Anthony PERARD
` (17 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
From: Ian Jackson <ian.jackson@eu.citrix.com>
This allows ./stack.sh to access the global internet.
CC: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
ts-openstack-deploy | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index 6f061eb..d2971f5 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -136,8 +136,11 @@ END
}
sub deploy() {
+ my $httpproxy = http_proxy_envsettings($ho);
+
target_cmd($ho, <<END, 1800);
set -e
+ $httpproxy
cd $builddir/devstack
./stack.sh
END
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 04/21] TestSupport: provide target_https_mitm_proxy_cert_path
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (2 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 03/21] ts-openstack-deploy: Set http proxy Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 05/21] ts-openstack-deploy: set CURL_CA_BUNDLE Anthony PERARD
` (16 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
From: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Osstest/TestSupport.pm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 6e19b28..7215156 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -64,6 +64,7 @@ BEGIN {
target_put_guest_image target_editfile
target_editfile_cancel target_fetchurl
http_proxy_envsettings
+ target_https_mitm_proxy_cert_path
target_editfile_root target_file_exists
target_editfile_kvp_replace
target_run_apt
@@ -2714,4 +2715,10 @@ sub target_https_mitm_proxy_setup ($) {
target_cmd_root($ho, 'update-ca-certificates', 300);
}
+sub target_https_mitm_proxy_cert_path ($) {
+ my ($ho) = @_;
+ return undef unless length $c{HttpsProxyMITMCert};
+ return '/etc/ssl/certs/osstest.pem';
+}
+
1;
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 05/21] ts-openstack-deploy: set CURL_CA_BUNDLE
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (3 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 04/21] TestSupport: provide target_https_mitm_proxy_cert_path Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 06/21] ts-openstack-deploy: Keep CURL_CA_BUNDLE when sudo is called Anthony PERARD
` (15 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
From: Ian Jackson <ian.jackson@eu.citrix.com>
This overrides pip's attempt to specify a specific certificate bundle,
and is necessary if we have a MITM SSL proxy.
The security implications are not ideal, because the MITM proxy will
allow any X.509 cert from any CA, whereas pip would only allow an
expected cert. But we got pip via plain https to start with...
CC: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-deploy | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index d2971f5..6d7de1c 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -137,7 +137,10 @@ END
sub deploy() {
my $httpproxy = http_proxy_envsettings($ho);
-
+ my $mitmcert = target_https_mitm_proxy_cert_path($ho);
+ $httpproxy .=
+ "\n CURL_CA_BUNDLE=$mitmcert; export CURL_CA_BUNDLE"
+ if $mitmcert;
target_cmd($ho, <<END, 1800);
set -e
$httpproxy
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 06/21] ts-openstack-deploy: Keep CURL_CA_BUNDLE when sudo is called
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (4 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 05/21] ts-openstack-deploy: set CURL_CA_BUNDLE Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 07/21] ts-openstack-deploy: Try to disable use of SYSTEMD Anthony PERARD
` (14 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
This is part of commit "ts-openstack-deploy: set CURL_CA_BUNDLE" but
also allow pip to work when it is called via sudo without preserving the
existing environment variables.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-deploy | 1 +
1 file changed, 1 insertion(+)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index 6d7de1c..147071f 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -132,6 +132,7 @@ END
target_putfilecontents_root_stash($ho, 100,
<<END, "/etc/sudoers.d/devstack");
osstest ALL=(ALL) NOPASSWD:ALL
+Defaults:osstest env_keep += "CURL_CA_BUNDLE"
END
}
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 07/21] ts-openstack-deploy: Try to disable use of SYSTEMD
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (5 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 06/21] ts-openstack-deploy: Keep CURL_CA_BUNDLE when sudo is called Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 08/21] ts-kernel-build: Enable network related modules for Neutron Anthony PERARD
` (13 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
There is USE_SYSTEMD off by default, but it is now turned on if
USE_SCREEN if off. Try to keep use of systemd disabled.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-deploy | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index 147071f..1349009 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -45,7 +45,6 @@ sub checkout () {
[[local|localrc]]
# Everything should be cloned by osstest, so devstack don't have to do it
ERROR_ON_CLONE=True
-USE_SCREEN=False
ADMIN_PASSWORD=secretadmin
DATABASE_PASSWORD=secretdatabase
RABBIT_PASSWORD=secretrabbit
@@ -71,6 +70,9 @@ disable_service q-meta
disable_service q-agt
disable_service q-l3
enable_service n-net
+USE_SYSTEMD=False
+# To keep systemd off, we need to enable use of screen
+USE_SCREEN=True
[[post-config|\$CINDER_CONF]]
[lvmdriver-1]
volume_group = $vg
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 08/21] ts-kernel-build: Enable network related modules for Neutron
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (6 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 07/21] ts-openstack-deploy: Try to disable use of SYSTEMD Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 09/21] ts-openstack-deploy: Switch to Neutron for network Anthony PERARD
` (12 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Those options/modules are needed to run OpenStack Neutron with Open
vSwitch.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-kernel-build | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/ts-kernel-build b/ts-kernel-build
index 94e67a4..0bcd340 100755
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -252,10 +252,23 @@ setopt CONFIG_BLK_DEV_LOOP y
setopt CONFIG_PACKET y
-# needed for OpenStack
-# because: https://bugzilla.redhat.com/show_bug.cgi?id=910619#c6
+# Used by OpenStack Neutron with Open vSwitch
+setopt CONFIG_OPENVSWITCH m
+setopt CONFIG_IP6_NF_RAW m
+setopt CONFIG_IP_NF_RAW m
+setopt CONFIG_IP_SET m
+setopt CONFIG_IP_SET_HASH_NET m
setopt CONFIG_NETFILTER_ADVANCED y
+setopt CONFIG_NETFILTER_XT_CONNMARK m
+setopt CONFIG_NETFILTER_XT_MATCH_COMMENT m
+setopt CONFIG_NETFILTER_XT_MATCH_MAC m
+setopt CONFIG_NETFILTER_XT_MATCH_PHYSDEV m
+setopt CONFIG_NETFILTER_XT_SET m
setopt CONFIG_NETFILTER_XT_TARGET_CHECKSUM m
+setopt CONFIG_NETFILTER_XT_TARGET_CT m
+setopt CONFIG_NETFILTER_XT_TARGET_REDIRECT m
+setopt CONFIG_NF_CONNTRACK_ZONES y
+setopt CONFIG_VETH m
# Used by OpenStack Tempest to test encrypted volume
setopt CONFIG_CRYPTO_XTS m
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 09/21] ts-openstack-deploy: Switch to Neutron for network
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (7 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 08/21] ts-kernel-build: Enable network related modules for Neutron Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ Anthony PERARD
` (11 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
nova-network is not supported anymore and Neutron is the default.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-deploy | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index 1349009..2107760 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -35,6 +35,7 @@ sub checkout () {
build_clone($ho, 'openstack_devstack', $builddir, 'devstack');
build_clone($ho, 'openstack_glance', $builddir, 'glance');
build_clone($ho, 'openstack_keystone', $builddir, 'keystone');
+ build_clone($ho, 'openstack_neutron', $builddir, 'neutron');
build_clone($ho, 'openstack_nova', $builddir, 'nova');
build_clone($ho, 'openstack_requirements', $builddir, 'requirements');
build_clone($ho, 'openstack_tempest', $builddir, 'tempest');
@@ -63,13 +64,6 @@ LIBVIRT_TYPE=xen
disable_service horizon
disable_service n-novnc
disable_service dstat
-# Disable neutron and switch back to nova-network
-disable_service q-svc
-disable_service q-dhcp
-disable_service q-meta
-disable_service q-agt
-disable_service q-l3
-enable_service n-net
USE_SYSTEMD=False
# To keep systemd off, we need to enable use of screen
USE_SCREEN=True
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (8 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 09/21] ts-openstack-deploy: Switch to Neutron for network Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-19 10:28 ` Ian Jackson
2017-07-12 15:04 ` [OSSTEST PATCH v12 11/21] ts-openstack-deploy: Apply a Tempest patch Anthony PERARD
` (10 subsequent siblings)
20 siblings, 1 reply; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
ts-openstack-deploy | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index 2107760..f677513 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -130,6 +130,13 @@ END
osstest ALL=(ALL) NOPASSWD:ALL
Defaults:osstest env_keep += "CURL_CA_BUNDLE"
END
+
+ # Increase open fd limit of RabbitMQ server (message broker)
+ # https://bugs.launchpad.net/devstack/+bug/1703651
+ target_putfilecontents_root_stash($ho, 100,
+ <<END, "/etc/default/rabbitmq-server");
+ulimit -n 65536
+END
}
sub deploy() {
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ
2017-07-12 15:04 ` [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ Anthony PERARD
@ 2017-07-19 10:28 ` Ian Jackson
2017-07-19 11:08 ` Anthony PERARD
0 siblings, 1 reply; 36+ messages in thread
From: Ian Jackson @ 2017-07-19 10:28 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel
Anthony PERARD writes ("[OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ"):
> + target_putfilecontents_root_stash($ho, 100,
> + <<END, "/etc/default/rabbitmq-server");
> +ulimit -n 65536
Is the lack of this not an upstream bug of some kind ?
And, for osstest, why 65536 and not, say, "unlimited" ?
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ
2017-07-19 10:28 ` Ian Jackson
@ 2017-07-19 11:08 ` Anthony PERARD
2017-07-19 13:05 ` Ian Jackson
0 siblings, 1 reply; 36+ messages in thread
From: Anthony PERARD @ 2017-07-19 11:08 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, Jul 19, 2017 at 11:28:29AM +0100, Ian Jackson wrote:
> Anthony PERARD writes ("[OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ"):
> > + target_putfilecontents_root_stash($ho, 100,
> > + <<END, "/etc/default/rabbitmq-server");
> > +ulimit -n 65536
>
> Is the lack of this not an upstream bug of some kind ?
I don't know.
FIY, when rabbitmq is install on debian, we have:
cat /etc/default/rabbitmq-server
# This file is sourced by /etc/init.d/rabbitmq-server. Its primary
# reason for existing is to allow adjustment of system limits for the
# rabbitmq-server process.
#
# Maximum number of open file handles. This will need to be increased
# to handle many simultaneous connections. Refer to the system
# documentation for ulimit (in man bash) for more information.
#
#ulimit -n 1024
> And, for osstest, why 65536 and not, say, "unlimited" ?
I've just reproduce the number from the openstack ci loop. Which is the
found in rabbitmq-server.service, which I think is found in ubuntu
package of rabbitmq.
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ
2017-07-19 11:08 ` Anthony PERARD
@ 2017-07-19 13:05 ` Ian Jackson
2017-07-19 13:25 ` Anthony PERARD
0 siblings, 1 reply; 36+ messages in thread
From: Ian Jackson @ 2017-07-19 13:05 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel
Anthony PERARD writes ("Re: [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ"):
> On Wed, Jul 19, 2017 at 11:28:29AM +0100, Ian Jackson wrote:
> > Anthony PERARD writes ("[OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ"):
> > > + target_putfilecontents_root_stash($ho, 100,
> > > + <<END, "/etc/default/rabbitmq-server");
> > > +ulimit -n 65536
> >
> > Is the lack of this not an upstream bug of some kind ?
>
> I don't know.
OK, then. I think it probably is. Feel free to try to convince me
otherwise...
> FIY, when rabbitmq is install on debian, we have:
> cat /etc/default/rabbitmq-server
> # This file is sourced by /etc/init.d/rabbitmq-server. Its primary
> # reason for existing is to allow adjustment of system limits for the
> # rabbitmq-server process.
> #
> # Maximum number of open file handles. This will need to be increased
> # to handle many simultaneous connections. Refer to the system
> # documentation for ulimit (in man bash) for more information.
> #
> #ulimit -n 1024
That's rather mysterious.
> > And, for osstest, why 65536 and not, say, "unlimited" ?
>
> I've just reproduce the number from the openstack ci loop. Which is the
> found in rabbitmq-server.service, which I think is found in ubuntu
> package of rabbitmq.
None of this seems to explain why this isn't a configuration which
should be supplied or arranged by upstream.
(I noticed when looking at my previous reviews that I made a similar
point last time I saw this hunk...)
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ
2017-07-19 13:05 ` Ian Jackson
@ 2017-07-19 13:25 ` Anthony PERARD
2017-07-19 13:38 ` Ian Jackson
0 siblings, 1 reply; 36+ messages in thread
From: Anthony PERARD @ 2017-07-19 13:25 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, Jul 19, 2017 at 02:05:44PM +0100, Ian Jackson wrote:
> Anthony PERARD writes ("Re: [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ"):
> > On Wed, Jul 19, 2017 at 11:28:29AM +0100, Ian Jackson wrote:
> > > Anthony PERARD writes ("[OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ"):
> > > > + target_putfilecontents_root_stash($ho, 100,
> > > > + <<END, "/etc/default/rabbitmq-server");
> > > > +ulimit -n 65536
> > >
> > > Is the lack of this not an upstream bug of some kind ?
> >
> > I don't know.
>
> OK, then. I think it probably is. Feel free to try to convince me
> otherwise...
>
> > FIY, when rabbitmq is install on debian, we have:
> > cat /etc/default/rabbitmq-server
>
> > # This file is sourced by /etc/init.d/rabbitmq-server. Its primary
> > # reason for existing is to allow adjustment of system limits for the
> > # rabbitmq-server process.
> > #
> > # Maximum number of open file handles. This will need to be increased
> > # to handle many simultaneous connections. Refer to the system
> > # documentation for ulimit (in man bash) for more information.
> > #
> > #ulimit -n 1024
>
> That's rather mysterious.
>
> > > And, for osstest, why 65536 and not, say, "unlimited" ?
> >
> > I've just reproduce the number from the openstack ci loop. Which is the
> > found in rabbitmq-server.service, which I think is found in ubuntu
> > package of rabbitmq.
>
> None of this seems to explain why this isn't a configuration which
> should be supplied or arranged by upstream.
>
> (I noticed when looking at my previous reviews that I made a similar
> point last time I saw this hunk...)
But the hunk is different, I've created a bug report for openstack.
https://bugs.launchpad.net/devstack/+bug/1703651
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [OSSTEST PATCH v12 11/21] ts-openstack-deploy: Apply a Tempest patch
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (9 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 10/21] ts-openstack-deploy: Increase open fd limit for RabbitMQ Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:04 ` [OSSTEST PATCH v12 12/21] ts-openstack-deploy: Ignore libvirt-python version and use latest Anthony PERARD
` (9 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-deploy | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index f677513..befe3d3 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -137,6 +137,15 @@ END
<<END, "/etc/default/rabbitmq-server");
ulimit -n 65536
END
+
+ # Apply https://review.openstack.org/449695/ to tempest to workaround an
+ # issue. Check comments for more information
+ target_cmd($ho, <<END, 120);
+set -e
+cd $builddir/tempest
+git fetch origin refs/changes/95/449695/1
+git cherry-pick FETCH_HEAD
+END
}
sub deploy() {
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 12/21] ts-openstack-deploy: Ignore libvirt-python version and use latest
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (10 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 11/21] ts-openstack-deploy: Apply a Tempest patch Anthony PERARD
@ 2017-07-12 15:04 ` Anthony PERARD
2017-07-12 15:05 ` [OSSTEST PATCH v12 13/21] ts-openstack-tempest: Fix tempest invocation Anthony PERARD
` (8 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:04 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Devstack is going to try to install a specific version of libvirt-python
(currently 2.5.0) but this fail with libvirt installed by osstest.
Remove the requirement and use the latest available instead.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-deploy | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index befe3d3..00f262f 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -93,6 +93,21 @@ END
}
);
+ target_editfile($ho,
+ "$builddir/requirements/upper-constraints.txt",
+ sub {
+ while (<EI>) {
+ # Ignore libvirt-python requirement and install latest,
+ # otherwise it's not going to work with latest libvirt
+ # installed by osstest.
+ if (m/^libvirt-python===.*$/) {
+ next;
+ }
+ print EO or die $!;
+ }
+ }
+ );
+
# Package python-systemd does not exist in Debian installed by osstest
target_editfile($ho, "$builddir/devstack/files/debs/general", sub {
while (<EI>) {
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 13/21] ts-openstack-tempest: Fix tempest invocation
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (11 preceding siblings ...)
2017-07-12 15:04 ` [OSSTEST PATCH v12 12/21] ts-openstack-deploy: Ignore libvirt-python version and use latest Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
2017-07-12 15:05 ` [OSSTEST PATCH v12 14/21] ts-openstack-tempest: Update list of skipped tests Anthony PERARD
` (7 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
./run_tempest.sh is deprecated.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-tempest | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ts-openstack-tempest b/ts-openstack-tempest
index 82e9a71..b95043a 100755
--- a/ts-openstack-tempest
+++ b/ts-openstack-tempest
@@ -58,7 +58,8 @@ sub tempest() {
target_cmd($ho, <<END, 7200);
set -e
-$builddir/tempest/run_tempest.sh --virtual-env -- --concurrency=2 '$regex'
+cd $builddir/tempest
+tempest run --concurrency=2 --regex '$regex'
END
}
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 14/21] ts-openstack-tempest: Update list of skipped tests
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (12 preceding siblings ...)
2017-07-12 15:05 ` [OSSTEST PATCH v12 13/21] ts-openstack-tempest: Fix tempest invocation Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
2017-07-19 10:29 ` Ian Jackson
2017-07-12 15:05 ` [OSSTEST PATCH v12 15/21] ts-openstack-deploy: Move logs to /var/log/openstack Anthony PERARD
` (6 subsequent siblings)
20 siblings, 1 reply; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
ts-openstack-tempest | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/ts-openstack-tempest b/ts-openstack-tempest
index b95043a..ae3662f 100755
--- a/ts-openstack-tempest
+++ b/ts-openstack-tempest
@@ -31,23 +31,20 @@ sub tempest() {
my $scenario = 'tempest.scenario';
my $volume_boot_pattern =
"$scenario.test_volume_boot_pattern.TestVolumeBootPattern";
- my $shelve_instance = "$scenario.test_shelve_instance.TestShelveInstance";
-
- # Ignore tests which try to boot a guest with /dev/vda as boot device name.
- push @ignored_tests,
- "^\Q$volume_boot_pattern.test_volume_boot_pattern\E";
- push @ignored_tests,
- "^\Q$volume_boot_pattern.test_create_ebs_image_and_check_boot\E";
- push @ignored_tests,
- "^\Q$shelve_instance.test_shelve_volume_backed_instance\E";
# Those tests access a volume through iSCSI. This does not work when both
# the server and client of iSCSI are on the same Xen host (both in dom0),
# Linux 4.0 is the first Linux to have a fix.
push @ignored_tests,
- "^\Q${volume_boot_pattern}V2.test_volume_boot_pattern\E";
+ "^\Q${volume_boot_pattern}.test_volume_boot_pattern\E";
+ push @ignored_tests,
+ "^\Q${volume_boot_pattern}.test_create_ebs_image_and_check_boot\E";
+
+ # See nova.git:devstack/tempest-dsvm-tempest-xen-rc
+ push @ignored_tests,
+ "^\Qtempest.api.compute.admin.test_volume_swap.TestVolumeSwap.test_volume_swap\E";
push @ignored_tests,
- "^\Q${volume_boot_pattern}V2.test_create_ebs_image_and_check_boot\E";
+ "^\Qtempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_paused_server\E";
# This regex below select the tests to run and exclude the ones marked as
# slow as well as the explicit tests listed above. It is based on the one
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 15/21] ts-openstack-deploy: Move logs to /var/log/openstack
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (13 preceding siblings ...)
2017-07-12 15:05 ` [OSSTEST PATCH v12 14/21] ts-openstack-tempest: Update list of skipped tests Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
2017-07-12 15:05 ` [OSSTEST PATCH v12 16/21] ts-logs-capture: Capture OpenStack logs Anthony PERARD
` (5 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-deploy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index 00f262f..e7c94a5 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -58,7 +58,7 @@ DEST=$builddir
DATA_DIR=\$DEST/data
SERVICE_DIR=\$DEST/status
SUBUNIT_OUTPUT=\$DEST/devstack.subunit
-LOGFILE=\$DEST/logs/stack.sh.log
+LOGDIR=/var/log/openstack
LOG_COLOR=False
LIBVIRT_TYPE=xen
disable_service horizon
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 16/21] ts-logs-capture: Capture OpenStack logs
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (14 preceding siblings ...)
2017-07-12 15:05 ` [OSSTEST PATCH v12 15/21] ts-openstack-deploy: Move logs to /var/log/openstack Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
2017-07-12 15:05 ` [OSSTEST PATCH v12 17/21] ts-openstack-deploy: Increase devstack timeout Anthony PERARD
` (4 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-logs-capture | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ts-logs-capture b/ts-logs-capture
index 061a118..0e3d267 100755
--- a/ts-logs-capture
+++ b/ts-logs-capture
@@ -171,6 +171,12 @@ sub fetch_logs_host () {
/var/core/*.core
+ /var/log/openstack/*.log
+ /etc/nova/*
+ /etc/neutron/*
+ /etc/cinder/*
+ /home/osstest/build.*.test-*-devstack/tempest/etc/tempest.conf
+
)];
if (!try_fetch_logs($ho, $logs)) {
logm("log fetching failed, trying hard host reboot...");
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 17/21] ts-openstack-deploy: Increase devstack timeout
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (15 preceding siblings ...)
2017-07-12 15:05 ` [OSSTEST PATCH v12 16/21] ts-logs-capture: Capture OpenStack logs Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
2017-07-12 15:05 ` [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps Anthony PERARD
` (3 subsequent siblings)
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-openstack-deploy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ts-openstack-deploy b/ts-openstack-deploy
index e7c94a5..875c4a7 100755
--- a/ts-openstack-deploy
+++ b/ts-openstack-deploy
@@ -169,7 +169,7 @@ sub deploy() {
$httpproxy .=
"\n CURL_CA_BUNDLE=$mitmcert; export CURL_CA_BUNDLE"
if $mitmcert;
- target_cmd($ho, <<END, 1800);
+ target_cmd($ho, <<END, 3600);
set -e
$httpproxy
cd $builddir/devstack
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (16 preceding siblings ...)
2017-07-12 15:05 ` [OSSTEST PATCH v12 17/21] ts-openstack-deploy: Increase devstack timeout Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
2017-07-13 13:28 ` Ian Jackson
2017-07-12 15:05 ` [OSSTEST PATCH v12 19/21] ts-openstack-tempest: Use target_cmd_subunit Anthony PERARD
` (2 subsequent siblings)
20 siblings, 1 reply; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
target_cmd_subunit can be used like target_cmd, but the command would
needs to output a subunit v1 stream, which will be parsed and turned
into osstest substeps. The command can be `| subunit-2to1` in order to
turn a subunit v2 stream into v1.
Currently, time is not taken into account, and all substeps will have
bogus timestamp as the output of the command is parsed after it has
runned.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
Osstest/TestSupport.pm | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 7215156..f3174d2 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -55,6 +55,7 @@ BEGIN {
target_cmd_root_status target_cmd_output_root_status
target_cmd_root target_cmd target_cmd_build
+ target_cmd_subunit
target_cmd_output_root target_cmd_output
target_cmd_inputfh_root sshuho
target_getfile target_getfile_root
@@ -737,6 +738,48 @@ sub target_cmd_root ($$;$$) { tcmd(undef,undef,0, 'root',@_); }
# Instead, returns the wait status (ie, what came in $?)
sub target_cmd_root_status ($$;$$) { tcmd(undef,undef,1, 'root',@_); }
+sub subunit_result_to_osstest_result ($) {
+ my ($ret) = @_;
+ return "pass" if $ret eq "success" or $ret eq "successful";
+ return "fail" if $ret eq "failure";
+ return "skip" if $ret eq "skip";
+ return "fail" if $ret eq "error";
+}
+sub subunit_sanitize ($) {
+ my ($testname) = @_;
+ $testname =~ s/ /_/g;
+ return $testname;
+}
+
+sub target_cmd_subunit ($$;$$) {
+ my $stdout = IO::File::new_tmpfile();
+ my $rc = tcmd(undef,$stdout,0, 'osstest', @_);
+ $stdout->seek(0,0) or die "$stdout $!";
+ my $logfilename = undef;
+ my $fh = undef;
+
+ while (<$stdout>) {
+ if (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)(\.\d+)?Z$/) {
+ # This is the timestamp for the next events
+ } elsif (/^test: (.+)\n/) {
+ $logfilename = subunit_sanitize($1) . '.log';
+ $fh = open_unique_stashfile(\$logfilename);
+ substep_start(subunit_sanitize($1), $logfilename);
+ } elsif (/^(success(ful)?|failure|skip|error): (.+?)( \[( multipart)?)?$/) {
+ if ($4) {
+ my $test_output = "";
+ while (<$stdout>) {
+ last if (/^\]$/);
+ $test_output .= $_;
+ }
+ print $fh $test_output or die $!;
+ }
+ close $fh or die $!;
+ substep_finish(subunit_sanitize($3), subunit_result_to_osstest_result($1));
+ }
+ }
+}
+
sub tcmdout {
my $stdout= IO::File::new_tmpfile();
my $badstatusok = $_[1];
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps
2017-07-12 15:05 ` [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps Anthony PERARD
@ 2017-07-13 13:28 ` Ian Jackson
2017-07-13 14:43 ` Anthony PERARD
0 siblings, 1 reply; 36+ messages in thread
From: Ian Jackson @ 2017-07-13 13:28 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel
Anthony PERARD writes ("[OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps"):
> target_cmd_subunit can be used like target_cmd, but the command would
> needs to output a subunit v1 stream, which will be parsed and turned
> into osstest substeps. The command can be `| subunit-2to1` in order to
> turn a subunit v2 stream into v1.
Thanks.
> Currently, time is not taken into account, and all substeps will have
> bogus timestamp as the output of the command is parsed after it has
> runned.
I think this is not a critical problem, but fixing it would be nice at
some point.
> +sub subunit_result_to_osstest_result ($) {
> + my ($ret) = @_;
> + return "pass" if $ret eq "success" or $ret eq "successful";
> + return "fail" if $ret eq "failure";
> + return "skip" if $ret eq "skip";
> + return "fail" if $ret eq "error";
> +}
I think this needs to die at the end, if the input is not recognised.
> +sub subunit_sanitize ($) {
> + my ($testname) = @_;
> + $testname =~ s/ /_/g;
> + return $testname;
> +}
This function should have a more specific name. Also it needs to be a
whitelist.
> +sub target_cmd_subunit ($$;$$) {
> + my $stdout = IO::File::new_tmpfile();
> + my $rc = tcmd(undef,$stdout,0, 'osstest', @_);
It would be better to staxh the original subunit output. And I would
prefer to avoid direct use of tcmd here. So can you introduce
target_cmd_stashed
which calls open_unique_stashfile and tcmd, and then use that in your
subunit subroutine? (And yes this might duplicte output I think.)
I'm not sure target_cmd_subunit is quite the right name. Maybe
target_subunit_cmd ?
> + while (<$stdout>) {
> + if (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)(\.\d+)?Z$/) {
> + # This is the timestamp for the next events
> + } elsif (/^test: (.+)\n/) {
> + $logfilename = subunit_sanitize($1) . '.log';
> + $fh = open_unique_stashfile(\$logfilename);
> + substep_start(subunit_sanitize($1), $logfilename);
> + } elsif (/^(success(ful)?|failure|skip|error): (.+?)( \[( multipart)?)?$/) {
Please assign your $n to local variables, rather than leaving them in
$3 etc. to be used much later. (And don't capture things if you don't
intend to, so in that case use ?:). What does the multpart mean ?
Does this code need to care ? Does the subunit protocol insist that
the spaces are single spaces ? If not you need to use \s+. You may
want to use the extended regexp syntax.
> + if ($4) {
> + my $test_output = "";
> + while (<$stdout>) {
> + last if (/^\]$/);
> + $test_output .= $_;
> + }
> + print $fh $test_output or die $!;
Why do you bother accumulating this in $test_output rather than just
printing it ?
Does the subunit protocol not have any escaping ? (Ie, what happens
if a thing run as part of a subunit test actually generates a line of
log output "]" ?) If it does havve some escaping you need to
de-escape it.
> + }
> + close $fh or die $!;
> + substep_finish(subunit_sanitize($3), subunit_result_to_osstest_result($1));
> + }
What are subunit v1 consumers supposed to do with 1. unknown keywords
2. syntax errors ?
I doubt that the answer to (2) is to ignore them as you do here...
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps
2017-07-13 13:28 ` Ian Jackson
@ 2017-07-13 14:43 ` Anthony PERARD
2017-07-13 18:11 ` Anthony PERARD
2017-07-17 17:06 ` Ian Jackson
0 siblings, 2 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-13 14:43 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Thu, Jul 13, 2017 at 02:28:11PM +0100, Ian Jackson wrote:
> Anthony PERARD writes ("[OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps"):
> > Currently, time is not taken into account, and all substeps will have
> > bogus timestamp as the output of the command is parsed after it has
> > runned.
>
> I think this is not a critical problem, but fixing it would be nice at
> some point.
The subunit stream contains the timestamps, so it just a matter of
having substep_* taking it as an argument.
> > +sub subunit_result_to_osstest_result ($) {
> > + my ($ret) = @_;
> > + return "pass" if $ret eq "success" or $ret eq "successful";
> > + return "fail" if $ret eq "failure";
> > + return "skip" if $ret eq "skip";
> > + return "fail" if $ret eq "error";
> > +}
>
> I think this needs to die at the end, if the input is not recognised.
Will do.
> > +sub subunit_sanitize ($) {
> > + my ($testname) = @_;
> > + $testname =~ s/ /_/g;
> > + return $testname;
> > +}
>
> This function should have a more specific name. Also it needs to be a
> whitelist.
What about subunit_sanitize_testname?
What kind of whitelist? What should it includes?
> > +sub target_cmd_subunit ($$;$$) {
> > + my $stdout = IO::File::new_tmpfile();
> > + my $rc = tcmd(undef,$stdout,0, 'osstest', @_);
>
> It would be better to staxh the original subunit output. And I would
> prefer to avoid direct use of tcmd here. So can you introduce
> target_cmd_stashed
> which calls open_unique_stashfile and tcmd, and then use that in your
> subunit subroutine? (And yes this might duplicte output I think.)
Will do. And yes, this will duplicate most of the output. But it can
help debug osstest, for everything that the parser ignore.
>
> I'm not sure target_cmd_subunit is quite the right name. Maybe
> target_subunit_cmd ?
OK.
> > + while (<$stdout>) {
> > + if (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)(\.\d+)?Z$/) {
> > + # This is the timestamp for the next events
> > + } elsif (/^test: (.+)\n/) {
> > + $logfilename = subunit_sanitize($1) . '.log';
> > + $fh = open_unique_stashfile(\$logfilename);
> > + substep_start(subunit_sanitize($1), $logfilename);
> > + } elsif (/^(success(ful)?|failure|skip|error): (.+?)( \[( multipart)?)?$/) {
>
> Please assign your $n to local variables, rather than leaving them in
> $3 etc. to be used much later. (And don't capture things if you don't
> intend to, so in that case use ?:). What does the multpart mean ?
> Does this code need to care ?
multipart just describes how the following lines are formated, it would
have the 'content-type:' and the size of the output. non-multipart is
just followed by text, and ends with '\n]\n' (both format do).
I don't think the code needs to care about it, just that it may or
may not be there.
> Does the subunit protocol insist that
> the spaces are single spaces ? If not you need to use \s+. You may
> want to use the extended regexp syntax.
Looking at a description of the protocol and at the subunit code, does
are single spaces.
What do you mean by "extended" ? Maybe operator like /.+?/, or maybe
/(?<NAME>pattern)/ ?
> > + if ($4) {
> > + my $test_output = "";
> > + while (<$stdout>) {
> > + last if (/^\]$/);
> > + $test_output .= $_;
> > + }
> > + print $fh $test_output or die $!;
>
> Why do you bother accumulating this in $test_output rather than just
> printing it ?
No reason, I'll print.
> Does the subunit protocol not have any escaping ? (Ie, what happens
> if a thing run as part of a subunit test actually generates a line of
> log output "]" ?) If it does havve some escaping you need to
> de-escape it.
Without "multipart", there does not seems to be any escaping. With
multipart, the size of the output is in the protocol, I could extend the
parser take it into account. It's just more work.
FYI, part of the protocol about the output (with the beginning of
DETAILS been "\[( multipart)?" in the regex):
DETAILS ::= BRACKETED | MULTIPART
BRACKETED ::= '[' CR UTF8-lines ']' CR
MULTIPART ::= '[ multipart' CR PART* ']' CR
PART ::= PART_TYPE CR NAME CR PART_BYTES CR
PART_TYPE ::= Content-Type: type/sub-type(;parameter=value,parameter=value)
PART_BYTES ::= (DIGITS CR LF BYTE{DIGITS})* '0' CR LF
> > + }
> > + close $fh or die $!;
> > + substep_finish(subunit_sanitize($3), subunit_result_to_osstest_result($1));
> > + }
>
> What are subunit v1 consumers supposed to do with 1. unknown keywords
> 2. syntax errors ?
> I doubt that the answer to (2) is to ignore them as you do here...
"unexpected lines [...] should be forwarded unaltered". That's is in the
readme of python-subunit project.
As for keywords that can exist, there is "tags:", but in the case of
tempest, it describe which worker did a test, when there is several
concurrent worker. There is also "progress:" which is not very usefull
for osstest. There is maybe more keywords which are test result which I
should probably find out what there are, but I've got at least the one
used by Tempest.
Thanks,
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps
2017-07-13 14:43 ` Anthony PERARD
@ 2017-07-13 18:11 ` Anthony PERARD
2017-07-17 17:12 ` Ian Jackson
2017-07-17 17:06 ` Ian Jackson
1 sibling, 1 reply; 36+ messages in thread
From: Anthony PERARD @ 2017-07-13 18:11 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Thu, Jul 13, 2017 at 03:43:55PM +0100, Anthony PERARD wrote:
> On Thu, Jul 13, 2017 at 02:28:11PM +0100, Ian Jackson wrote:
> > Anthony PERARD writes ("[OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps"):
> > > +sub target_cmd_subunit ($$;$$) {
> > > + my $stdout = IO::File::new_tmpfile();
> > > + my $rc = tcmd(undef,$stdout,0, 'osstest', @_);
> >
> > It would be better to staxh the original subunit output. And I would
> > prefer to avoid direct use of tcmd here. So can you introduce
> > target_cmd_stashed
> > which calls open_unique_stashfile and tcmd, and then use that in your
> > subunit subroutine? (And yes this might duplicte output I think.)
>
> Will do. And yes, this will duplicate most of the output. But it can
> help debug osstest, for everything that the parser ignore.
I can't figure out what should target_cmd_stashed prototype be. Should
it be like target_cmd_output (returning the output of the cmd) ? Or
maybe like target_cmd but return a filename (which contain the output of
the cmd) ? I thought also about returning an file descriptor but it may
not be a good idee to leave the caller with an open fd.
Also, how to call the stashed file ? So far, I would go with "$job". Or
maybe adding an argument to target_cmd_stashed so the caller can choose
a filename.
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps
2017-07-13 18:11 ` Anthony PERARD
@ 2017-07-17 17:12 ` Ian Jackson
0 siblings, 0 replies; 36+ messages in thread
From: Ian Jackson @ 2017-07-17 17:12 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel
Anthony PERARD writes ("Re: [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps"):
> On Thu, Jul 13, 2017 at 03:43:55PM +0100, Anthony PERARD wrote:
> > Will do. And yes, this will duplicate most of the output. But it can
> > help debug osstest, for everything that the parser ignore.
>
> I can't figure out what should target_cmd_stashed prototype be. Should
> it be like target_cmd_output (returning the output of the cmd) ? Or
> maybe like target_cmd but return a filename (which contain the output of
> the cmd) ?
Either of these will do I think. Either return the filename and have
the caller use get_filecontents, or simply return the contents.
> I thought also about returning an file descriptor but it may
> not be a good idee to leave the caller with an open fd.
That's probably annoying.
> Also, how to call the stashed file ? So far, I would go with "$job". Or
> maybe adding an argument to target_cmd_stashed so the caller can choose
> a filename.
target_cmd_stashed should use open_unique_stashfile and should
therefore pass $leafref from its caller.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps
2017-07-13 14:43 ` Anthony PERARD
2017-07-13 18:11 ` Anthony PERARD
@ 2017-07-17 17:06 ` Ian Jackson
1 sibling, 0 replies; 36+ messages in thread
From: Ian Jackson @ 2017-07-17 17:06 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel
Anthony PERARD writes ("Re: [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps"):
> On Thu, Jul 13, 2017 at 02:28:11PM +0100, Ian Jackson wrote:
> > I think this is not a critical problem, but fixing it would be nice at
> > some point.
>
> The subunit stream contains the timestamps, so it just a matter of
> having substep_* taking it as an argument.
Ah. Well, that can wait.
> > > +sub subunit_sanitize ($) {
> > > + my ($testname) = @_;
> > > + $testname =~ s/ /_/g;
> > > + return $testname;
> > > +}
> >
> > This function should have a more specific name. Also it needs to be a
> > whitelist.
>
> What about subunit_sanitize_testname?
SGTM.
> What kind of whitelist? What should it includes?
I mean: currently, you replace spaces with _s. But you ought to have
a specific list of characters that you allow without replacing.
It doesn't help that osstest doesn't have an official character set
for testids. Existing testids (other than various junk) contain
all of
[^;_.()/~0-9a-zA-Z-]
(in Perl regexp charset syntax).
I suggest permitting all of those except ; which seems to have been a
mistake and has now been eliminated. You may want to permit [ ] too.
> > Does the subunit protocol insist that
> > the spaces are single spaces ? If not you need to use \s+. You may
> > want to use the extended regexp syntax.
>
> Looking at a description of the protocol and at the subunit code, does
> are single spaces.
Fair enough.
> What do you mean by "extended" ? Maybe operator like /.+?/, or maybe
> /(?<NAME>pattern)/ ?
I mean //x. See "/x" in perlre(1). This is a matter of taste.
> multipart just describes how the following lines are formated, it would
> have the 'content-type:' and the size of the output. non-multipart is
> just followed by text, and ends with '\n]\n' (both format do).
>
> I don't think the code needs to care about it, just that it may or
> may not be there.
Hrm.
> > Does the subunit protocol not have any escaping ? (Ie, what happens
> > if a thing run as part of a subunit test actually generates a line of
> > log output "]" ?) If it does havve some escaping you need to
> > de-escape it.
>
> Without "multipart", there does not seems to be any escaping. With
> multipart, the size of the output is in the protocol, I could extend the
> parser take it into account. It's just more work.
I think you must be able to consume the "multipart" and use the size,
then. Otherwise if a test case printed output containing "\n]\n", in
multipart format, you would mishandle it and get desynchronised.
> FYI, part of the protocol about the output (with the beginning of
> DETAILS been "\[( multipart)?" in the regex):
>
> DETAILS ::= BRACKETED | MULTIPART
> BRACKETED ::= '[' CR UTF8-lines ']' CR
> MULTIPART ::= '[ multipart' CR PART* ']' CR
> PART ::= PART_TYPE CR NAME CR PART_BYTES CR
> PART_TYPE ::= Content-Type: type/sub-type(;parameter=value,parameter=value)
> PART_BYTES ::= (DIGITS CR LF BYTE{DIGITS})* '0' CR LF
Sounds like you have to parse the multipart counted parts, I'm afraid.
> > What are subunit v1 consumers supposed to do with 1. unknown keywords
> > 2. syntax errors ?
> > I doubt that the answer to (2) is to ignore them as you do here...
>
> "unexpected lines [...] should be forwarded unaltered". That's is in the
> readme of python-subunit project.
"forwarded" where I wonder ? I guess printing them to logm is fine.
But you shouldn't ignore them, I think.
> As for keywords that can exist, there is "tags:", but in the case of
> tempest, it describe which worker did a test, when there is several
> concurrent worker. There is also "progress:" which is not very usefull
> for osstest. There is maybe more keywords which are test result which I
> should probably find out what there are, but I've got at least the one
> used by Tempest.
Fair enough.
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [OSSTEST PATCH v12 19/21] ts-openstack-tempest: Use target_cmd_subunit
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (17 preceding siblings ...)
2017-07-12 15:05 ` [OSSTEST PATCH v12 18/21] TestSupport: Implement target_cmd_subunit a subunit stream parser into substeps Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
2017-07-13 13:28 ` Ian Jackson
2017-07-12 15:05 ` [OSSTEST PATCH v12 20/21] Create a flight to test OpenStack with xen-unstable and libvirt Anthony PERARD
2017-07-12 15:05 ` [OSSTEST PATCH v12 21/21] make-flight: Increase dom0_mem for openstack flight Anthony PERARD
20 siblings, 1 reply; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
ts-openstack-tempest | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ts-openstack-tempest b/ts-openstack-tempest
index ae3662f..f6b655f 100755
--- a/ts-openstack-tempest
+++ b/ts-openstack-tempest
@@ -53,10 +53,10 @@ sub tempest() {
my $regex = "(?!.*\\[.*\\bslow\\b.*\\]|$ignored_tests)".
"(^tempest\\.(api|scenario|thirdparty))";
- target_cmd($ho, <<END, 7200);
+ target_cmd_subunit($ho, <<END, 7200);
set -e
cd $builddir/tempest
-tempest run --concurrency=2 --regex '$regex'
+tempest run --concurrency=2 --subunit --regex '$regex' | subunit-2to1
END
}
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* [OSSTEST PATCH v12 20/21] Create a flight to test OpenStack with xen-unstable and libvirt
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (18 preceding siblings ...)
2017-07-12 15:05 ` [OSSTEST PATCH v12 19/21] ts-openstack-tempest: Use target_cmd_subunit Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
2017-07-19 12:56 ` Ian Jackson
2017-07-12 15:05 ` [OSSTEST PATCH v12 21/21] make-flight: Increase dom0_mem for openstack flight Anthony PERARD
20 siblings, 1 reply; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
This patch creates a flight "openstack-ocata", with those jobs:
build-amd64
build-amd64-libvirt
build-amd64-pvops
build-amd64-xsm
build-arm64
build-arm64-libvirt
build-arm64-pvops
build-arm64-xsm
build-armhf
build-armhf-libvirt
build-armhf-pvops
build-armhf-xsm
test-amd64-amd64-devstack
test-amd64-amd64-devstack-xsm
test-arm64-arm64-devstack
test-arm64-arm64-devstack-xsm
test-armhf-armhf-devstack
test-armhf-armhf-devstack-xsm
This would be a flight to test a stable release of OpenStack against
Xen.
OpenStack have many different repo which should be in sync, so we should
attempd to grab the revisions of the stable branch of every OpenStack
tree, for now, the runvars REVISION_* of tree other than nova is set to
"origin/stable/ocata", except Tempest does not have stable branch and
should be able to test any OpenStack version.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
ap-common | 19 +++++++++++++++++++
ap-fetch-version | 6 ++++++
ap-fetch-version-old | 7 +++++++
ap-print-url | 3 +++
ap-push | 7 +++++++
cr-daily-branch | 31 +++++++++++++++++++++++++++++++
cr-for-branches | 2 +-
cri-common | 1 +
make-flight | 46 +++++++++++++++++++++++++++++++++++++++++++++-
9 files changed, 120 insertions(+), 2 deletions(-)
diff --git a/ap-common b/ap-common
index cbb815c..adfdc11 100644
--- a/ap-common
+++ b/ap-common
@@ -54,6 +54,24 @@
: ${PUSH_TREE_OVMF:=$XENBITS:/home/xen/git/osstest/ovmf.git}
: ${BASE_TREE_OVMF:=git://xenbits.xen.org/osstest/ovmf.git}
+define_openstack_trees() {
+ local openstack_trees=(cinder glance keystone neutron nova requirements
+ tempest)
+ local tree
+ local url
+
+ : ${GIT_OPENSTACK_ORG:=git://git.openstack.org}
+ : ${TREE_OPENSTACK_DEVSTACK:=$GIT_OPENSTACK_ORG/openstack-dev/devstack.git}
+ for tree in "${openstack_trees[@]}"; do
+ url=$GIT_OPENSTACK_ORG/openstack/$tree.git
+ eval ": \${TREE_OPENSTACK_${tree^^}:=$url}"
+ done
+}
+
+define_openstack_trees
+: ${PUSH_TREE_OPENSTACK_NOVA:=$XENBITS:/home/xen/git/osstest/openstack-nova.git}
+: ${BASE_TREE_OPENSTACK_NOVA:=git://xenbits.xen.org/osstest/openstack-nova.git}
+
: ${TREE_LINUXFIRMWARE:=git://xenbits.xen.org/osstest/linux-firmware.git}
: ${PUSH_TREE_LINUXFIRMWARE:=$XENBITS:/home/osstest/ext/linux-firmware.git}
: ${UPSTREAM_TREE_LINUXFIRMWARE:=$GIT_KERNEL_ORG/pub/scm/linux/kernel/git/firmware/linux-firmware.git}
@@ -82,6 +100,7 @@ fi
: ${LOCALREV_SEABIOS:=daily-cron.$branch}
: ${LOCALREV_OVMF:=daily-cron.$branch}
: ${LOCALREV_XTF:=daily-cron.$branch}
+: ${LOCALREV_OPENSTACK_NOVA:=daily-cron.$branch}
: ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27}
diff --git a/ap-fetch-version b/ap-fetch-version
index a107c93..03381fd 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -106,6 +106,12 @@ ovmf)
repo_tree_rev_fetch_git ovmf \
$TREE_OVMF_UPSTREAM master $LOCALREV_OVMF
;;
+openstack-ocata)
+ os_release=${branch#openstack-}
+ repo_tree_rev_fetch_git "openstack-nova" \
+ "$TREE_OPENSTACK_NOVA" "stable/$os_release" \
+ "$LOCALREV_OPENSTACK_NOVA"
+ ;;
osstest)
if [ "x$OSSTEST_USE_HEAD" = "xy" ] ; then
git update-ref -m "Arranging to test HEAD" \
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 3cbc176..6403bda 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -35,6 +35,7 @@ check_ap_fetch_placeholders
: ${BASE_LOCALREV_XTF:=daily-cron.$branch.old}
: ${BASE_LOCALREV_OVMF:=daily-cron.$branch.old}
: ${BASE_TAG_LIBVIRT:=xen-tested-master}
+: ${BASE_LOCALREV_OPENSTACK_NOVA:=daily-cron.$branch.old}
if info_linux_tree "$branch"; then
repo_tree_rev_fetch_git linux \
@@ -114,6 +115,12 @@ ovmf)
repo_tree_rev_fetch_git ovmf \
$BASE_TREE_OVMF xen-tested-master $BASE_LOCALREV_OVMF
;;
+openstack-ocata)
+ os_release="${branch##*-}"
+ repo_tree_rev_fetch_git openstack-nova \
+ "$BASE_TREE_OPENSTACK_NOVA" "xen-tested-stable-$os_release" \
+ "$BASE_LOCALREV_OPENSTACK_NOVA"
+ ;;
osstest)
if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
git fetch -f $HOME/testing.git production:ap-fetch
diff --git a/ap-print-url b/ap-print-url
index 93c14b3..cfba1d4 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -67,6 +67,9 @@ ovmf)
osstest)
echo none:;
;;
+openstack-ocata)
+ echo $TREE_OPENSTACK_NOVA
+ ;;
*)
echo >&2 "branch $branch ?"
exit 1
diff --git a/ap-push b/ap-push
index a27ccc2..6c9bddf 100755
--- a/ap-push
+++ b/ap-push
@@ -41,6 +41,7 @@ TREE_RUMPRUN=$PUSH_TREE_RUMPRUN
TREE_SEABIOS=$PUSH_TREE_SEABIOS
TREE_OVMF=$PUSH_TREE_OVMF
TREE_XTF=$PUSH_TREE_XTF
+TREE_OPENSTACK_NOVA=$PUSH_TREE_OPENSTACK_NOVA
if info_linux_tree "$branch"; then
cd $repos/linux
@@ -129,6 +130,12 @@ ovmf)
cd $repos/ovmf
git push $TREE_OVMF $revision:refs/heads/xen-tested-master
;;
+openstack-ocata)
+ cd $repos/openstack-nova
+ os_release=${branch#openstack-}
+ git push $TREE_OPENSTACK_NOVA \
+ $revision:refs/heads/xen-tested-stable-$os_release
+ ;;
osstest)
git push $HOME/testing.git $revision:production
if [ x"$TREEBRANCH_OSSTEST_UPSTREAM" != x ] ; then
diff --git a/cr-daily-branch b/cr-daily-branch
index 39483cd..e4613b3 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -207,6 +207,33 @@ if [ "x$REVISION_LINUXFIRMWARE" = x ]; then
determine_version REVISION_LINUXFIRMWARE linuxfirmware LINUXFIRMWARE
export REVISION_LINUXFIRMWARE
fi
+if [ "x$REVISION_OPENSTACK_NOVA" = x ]; then
+ determine_version REVISION_OPENSTACK_NOVA openstack-ocata OPENSTACK_NOVA
+ export REVISION_OPENSTACK_NOVA
+fi
+# Set REVISION for every tree that openstack is going to use and that have a
+# stable branch (tempest does not)
+determine_openstack_version() {
+ local os_tree="$1"
+ local os_release
+ local os_branch
+
+ if ! eval [ "x\$REVISION_OPENSTACK_${os_tree^^}" = x ]; then
+ return
+ fi
+ case "$branch" in
+ openstack-ocata)
+ os_release=${branch#openstack-}
+ os_branch="origin/stable/${branch##*-}"
+ eval "REVISION_OPENSTACK_${os_tree^^}=$os_branch"
+ export "REVISION_OPENSTACK_${os_tree^^}"
+ ;;
+ esac
+}
+for os_tree in cinder devstack glance keystone neutron requirements; do
+ determine_openstack_version "$os_tree"
+done
+
case "$tree" in
xen)
@@ -255,6 +282,10 @@ ovmf)
realtree=ovmf
NEW_REVISION=$REVISION_OVMF
;;
+openstack-nova)
+ realtree=openstack-nova
+ NEW_REVISION=$REVISION_OPENSTACK_NOVA
+ ;;
*)
NEW_REVISION=''
wantpush=false
diff --git a/cr-for-branches b/cr-for-branches
index a691273..ed76d70 100755
--- a/cr-for-branches
+++ b/cr-for-branches
@@ -31,7 +31,7 @@ scriptoptions="$1"; shift
LOGFILE=tmp/cr-for-branches.log
export LOGFILE
-: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-4.6-testing xen-4.7-testing xen-4.8-testing xen-4.9-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing qemu-upstream-4.5-testing qemu-upstream-4.6-testing qemu-upstream-4.7-testing qemu-upstream-4.8-testing qemu-upstream-4.9-testing linux-linus linux-4.9 linux-4.1 linux-3.18 linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf xtf ${EXTRA_BRANCHES}}
+: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-4.6-testing xen-4.7-testing xen-4.8-testing xen-4.9-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing qemu-upstream-4.5-testing qemu-upstream-4.6-testing qemu-upstream-4.7-testing qemu-upstream-4.8-testing qemu-upstream-4.9-testing linux-linus linux-4.9 linux-4.1 linux-3.18 linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf xtf openstack-ocata ${EXTRA_BRANCHES}}
export BRANCHES
fetchwlem=$wlem
diff --git a/cri-common b/cri-common
index 903fb4e..751a362 100644
--- a/cri-common
+++ b/cri-common
@@ -82,6 +82,7 @@ select_xenbranch () {
ovmf) tree=ovmf; xenbranch=xen-unstable ;;
distros-*|examine) tree=none; xenbranch=xen-unstable ;;
osstest) tree=osstest; xenbranch=xen-unstable ;;
+ openstack-ocata) tree=openstack-nova; xenbranch=xen-unstable ;;
esac
if [ "x$tree" = xlinux ]; then
linuxbranch=$branch
diff --git a/make-flight b/make-flight
index db124fe..3771b16 100755
--- a/make-flight
+++ b/make-flight
@@ -183,6 +183,16 @@ job_create_test_filter_callback () {
*) return 1;;
esac
;;
+ openstack*)
+ case "$job" in
+ *-devstack) ;;
+ *-devstack-xsm) ;;
+ *) return 1;;
+ esac
+ case $dom0arch in
+ i386) return 1 ;;
+ esac
+ ;;
*)
case "$job" in
*-qemuu-*)
@@ -216,7 +226,13 @@ arch_branch_filter_callback () {
ovmf) return 1;;
esac
;;
- i386|amd64)
+ i386)
+ case "$branch" in
+ linux-arm-xen) return 1;;
+ openstack*) return 1;;
+ esac
+ ;;
+ amd64)
case "$branch" in
linux-arm-xen) return 1;;
esac
@@ -680,6 +696,33 @@ do_examine_one () {
all_hostflags=$most_hostflags
}
+do_openstack_tests () {
+ local xsms=$(xenbranch_xsm_variants)
+ local openstack_trees=(cinder devstack glance keystone neutron nova
+ requirements tempest)
+
+ case "$branch" in
+ openstack*) ;;
+ *) return ;;
+ esac
+
+ local os_runvars=""
+ for tree in "${openstack_trees[@]}"; do
+ tree="openstack_$tree"
+ eval "os_runvars+=\" tree_$tree=\${TREE_${tree^^}}\""
+ eval "os_runvars+=\" revision_$tree=\${REVISION_${tree^^}}\""
+ done
+
+ for xsm in $xsms ; do
+ job_create_test test-$xenarch$kern-$dom0arch-devstack \
+ test-devstack libvirt $xenarch $dom0arch \
+ $os_runvars \
+ dom0_mem=4000 \
+ enable_xsm=$xsm \
+ all_hostflags=$most_hostflags
+ done
+}
+
test_matrix_do_one () {
do_pv_debian_tests
@@ -700,6 +743,7 @@ test_matrix_do_one () {
do_rtds_tests
do_credit2_tests
+ do_openstack_tests
do_examine_one
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 20/21] Create a flight to test OpenStack with xen-unstable and libvirt
2017-07-12 15:05 ` [OSSTEST PATCH v12 20/21] Create a flight to test OpenStack with xen-unstable and libvirt Anthony PERARD
@ 2017-07-19 12:56 ` Ian Jackson
2017-07-20 17:36 ` Anthony PERARD
0 siblings, 1 reply; 36+ messages in thread
From: Ian Jackson @ 2017-07-19 12:56 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel
Anthony PERARD writes ("[OSSTEST PATCH v12 20/21] Create a flight to test OpenStack with xen-unstable and libvirt"):
> This patch creates a flight "openstack-ocata", with those jobs:
...
I think it would help if you split apart the changes to make-flight
and mfi-* from the ones to cr-daily-* and ap-*.
> OpenStack have many different repo which should be in sync, so we should
> attempd to grab the revisions of the stable branch of every OpenStack
> tree, for now, the runvars REVISION_* of tree other than nova is set to
> "origin/stable/ocata", except Tempest does not have stable branch and
> should be able to test any OpenStack version.
Do you intend to provide a version of this patch which maintains a
tested branch for all of these different trees ?
And now some details:
> +openstack-ocata)
> + os_release="${branch##*-}"
Can you please call this variable os_release ?
I think for now we don't have the capacity to add openstack testing on
ARM. Can you please arrange to suppress those, in a way that means we
can add them in later ? Best would be a separate commit which we can
later revert.
> + $os_runvars \
Again, please use "openstack_..." not "os_...". "os" means "operating
system" to me.
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [OSSTEST PATCH v12 20/21] Create a flight to test OpenStack with xen-unstable and libvirt
2017-07-19 12:56 ` Ian Jackson
@ 2017-07-20 17:36 ` Anthony PERARD
0 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-20 17:36 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Wed, Jul 19, 2017 at 01:56:11PM +0100, Ian Jackson wrote:
> Anthony PERARD writes ("[OSSTEST PATCH v12 20/21] Create a flight to test OpenStack with xen-unstable and libvirt"):
> > This patch creates a flight "openstack-ocata", with those jobs:
> ...
>
> > OpenStack have many different repo which should be in sync, so we should
> > attempd to grab the revisions of the stable branch of every OpenStack
> > tree, for now, the runvars REVISION_* of tree other than nova is set to
> > "origin/stable/ocata", except Tempest does not have stable branch and
> > should be able to test any OpenStack version.
>
> Do you intend to provide a version of this patch which maintains a
> tested branch for all of these different trees ?
No, I don't. This would be a different patch (and maybe different patch
series).
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [OSSTEST PATCH v12 21/21] make-flight: Increase dom0_mem for openstack flight
2017-07-12 15:04 [OSSTEST PATCH v12 00/21] Have OpenStack tested on top of xen's master and libvirt's master Anthony PERARD
` (19 preceding siblings ...)
2017-07-12 15:05 ` [OSSTEST PATCH v12 20/21] Create a flight to test OpenStack with xen-unstable and libvirt Anthony PERARD
@ 2017-07-12 15:05 ` Anthony PERARD
20 siblings, 0 replies; 36+ messages in thread
From: Anthony PERARD @ 2017-07-12 15:05 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson
With 4G for dom0_mem, a host running devstack is using about 1.5G of
swap.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
make-flight | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make-flight b/make-flight
index 3771b16..16fe062 100755
--- a/make-flight
+++ b/make-flight
@@ -717,7 +717,7 @@ do_openstack_tests () {
job_create_test test-$xenarch$kern-$dom0arch-devstack \
test-devstack libvirt $xenarch $dom0arch \
$os_runvars \
- dom0_mem=4000 \
+ dom0_mem=6000 \
enable_xsm=$xsm \
all_hostflags=$most_hostflags
done
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 36+ messages in thread