Merge "Added core18 snap path to PATH."

This commit is contained in:
Zuul 2019-07-25 14:24:00 +00:00 committed by Gerrit Code Review
commit 1a34307f3b
3 changed files with 2 additions and 4 deletions

View File

@ -1,7 +1,7 @@
- job: - job:
name: microstack-tox-snap-with-sudo name: microstack-tox-snap-with-sudo
parent: openstack-tox-snap-with-sudo parent: openstack-tox-snap-with-sudo
timeout: 3600 timeout: 7200
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
- project: - project:

View File

@ -9,7 +9,7 @@ grade: stable
confinement: classic confinement: classic
environment: environment:
LD_LIBRARY_PATH: $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET 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 LC_ALL: C
OS_PLACEMENT_CONFIG_DIR: $SNAP/etc/nova/ OS_PLACEMENT_CONFIG_DIR: $SNAP/etc/nova/
# admin rc (TODO: put this someplace more sensible) # admin rc (TODO: put this someplace more sensible)

View File

@ -4,8 +4,6 @@ set -ex
export PATH=/snap/bin:$PATH export PATH=/snap/bin:$PATH
which nc || sudo apt install -y netcat
sudo apt update sudo apt update
sudo apt install -y snapd sudo apt install -y snapd