diff --git a/.zuul.yaml b/.zuul.yaml index a018c01..9c27995 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,7 +1,7 @@ - job: name: microstack-tox-snap-with-sudo parent: openstack-tox-snap-with-sudo - timeout: 3600 + timeout: 7200 nodeset: ubuntu-bionic - project: diff --git a/snapcraft.yaml b/snapcraft.yaml index 0c3baea..03b3af2 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,7 +9,7 @@ grade: stable confinement: classic environment: LD_LIBRARY_PATH: $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET - PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH + PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:/snap/core18/current/bin:$PATH LC_ALL: C OS_PLACEMENT_CONFIG_DIR: $SNAP/etc/nova/ # admin rc (TODO: put this someplace more sensible) diff --git a/tools/install_and_build.sh b/tools/install_and_build.sh index a7dccfc..f68b11d 100755 --- a/tools/install_and_build.sh +++ b/tools/install_and_build.sh @@ -4,8 +4,6 @@ set -ex export PATH=/snap/bin:$PATH -which nc || sudo apt install -y netcat - sudo apt update sudo apt install -y snapd