Merge "Remove fixup_virtualenv"
diff --git a/.zuul.yaml b/.zuul.yaml
index 0efca8c..cc97b89 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -602,9 +602,12 @@
voting: false
- swift-dsvm-functional:
voting: false
- irrelevant-files:
+ irrelevant-files: &dsvm-irrelevant-files
- ^.*\.rst$
- ^doc/.*$
+ - swift-dsvm-functional-py3:
+ voting: false
+ irrelevant-files: *dsvm-irrelevant-files
- grenade-py3:
irrelevant-files:
- ^.*\.rst$
diff --git a/doc/source/systemd.rst b/doc/source/systemd.rst
index 15b3f75..4f83b36 100644
--- a/doc/source/systemd.rst
+++ b/doc/source/systemd.rst
@@ -208,7 +208,8 @@
the one you want.
- ``systemd`` - a python 3 only library, not what you want.
- ``python-systemd`` - another library you don't want. Installing it
- on a system will break ansible's ability to run.
+ on a system will break ansible's ability to run. The package has now
+ been renamed to ``cysystemd``, which avoids the namespace collision.
If we were using user units, the ``[Service]`` - ``Group=`` parameter
diff --git a/files/debs/general b/files/debs/general
index 9f9d57c..ac29743 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -27,6 +27,7 @@
openssl
pkg-config
psmisc
+python3-dev
tar
tcpdump
unzip
diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh
index 6c71233..e140929 100755
--- a/tools/fixup_stuff.sh
+++ b/tools/fixup_stuff.sh
@@ -200,6 +200,11 @@
# have been dragged in by some other system dependency
sudo rm -rf /usr/lib/python3.6/site-packages/ply-*.egg-info
sudo rm -rf /usr/lib/python3.6/site-packages/six-*.egg-info
+
+ # Ensure trusted CA certificates are up to date
+ # See https://bugzilla.suse.com/show_bug.cgi?id=1154871
+ # May be removed once a new opensuse-15 image is available in nodepool
+ sudo zypper up -y p11-kit ca-certificates-mozilla
}
function fixup_all {