diff options
| author | Lingxian Kong <anlin.kong@gmail.com> | 2021-01-27 10:38:02 +1300 |
|---|---|---|
| committer | Lingxian Kong <anlin.kong@gmail.com> | 2021-03-25 10:25:38 +1300 |
| commit | ed5c5f962dfdb03593411c52113cee12979294f7 (patch) | |
| tree | 798e05c57ae6fb08a0b10568dc33216077a72954 | |
| parent | 7e8f8a371b4ce9067055d4727d2bf630b3f717c1 (diff) | |
| download | trove-ed5c5f962dfdb03593411c52113cee12979294f7.tar.gz | |
Stop using pip-and-virtualenv diskimage element
ALthough diskimage-builder will solve the issue eventually, but we
still prefer to put the package installation under trove's own control.
Story: 2008559
Task: 41697
Change-Id: Ie704db8233c4b797eeefa140c4a11427280dffd9
(Cherry picked from 1e04b269ca75067e28ae3e6ecb60ac2d11ab5b3b)
4 files changed, 8 insertions, 7 deletions
diff --git a/integration/scripts/files/elements/guest-agent/element-deps b/integration/scripts/files/elements/guest-agent/element-deps index ef309837..e894408e 100644 --- a/integration/scripts/files/elements/guest-agent/element-deps +++ b/integration/scripts/files/elements/guest-agent/element-deps @@ -3,5 +3,4 @@ package-installs pkg-map source-repositories svc-map -pip-and-virtualenv ubuntu-docker diff --git a/integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/31-guest-agent-install b/integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/31-guest-agent-install index 1eb66ffd..0cd63059 100755 --- a/integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/31-guest-agent-install +++ b/integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/31-guest-agent-install @@ -19,7 +19,7 @@ done install -D -g root -o ${GUEST_USERNAME} -m 0644 ${SCRIPTDIR}/guest-agent.logrotate /etc/logrotate.d/guest-agent # Create a virtual environment (with dependencies installed) for guest agent service -${DIB_PYTHON} -m virtualenv ${GUEST_VENV} +/usr/bin/python3 -m venv ${GUEST_VENV} ${GUEST_VENV}/bin/pip install pip --upgrade ${GUEST_VENV}/bin/pip install -U -c /opt/upper-constraints.txt /opt/guest-agent chown -R ${GUEST_USERNAME}:root ${GUEST_VENV} diff --git a/integration/scripts/files/elements/guest-agent/package-installs.yaml b/integration/scripts/files/elements/guest-agent/package-installs.yaml index 37e7daa4..f7470c40 100644 --- a/integration/scripts/files/elements/guest-agent/package-installs.yaml +++ b/integration/scripts/files/elements/guest-agent/package-installs.yaml @@ -1,10 +1,6 @@ guest-agent: installtype: package build-essential: -python3-all: -python3-all-dev: -python3-pip: -python3-sqlalchemy: libxml2-dev: libxslt1-dev: libffi-dev: @@ -12,4 +8,11 @@ libssl-dev: libyaml-dev: openssh-client: openssh-server: +pollinate: +psmisc: +python3-dev: +python3-pip: +python3-setuptools: +python3-sqlalchemy: +python3-venv: rsync: diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu index 12ff4f20..63ed2f06 100644 --- a/integration/scripts/functions_qemu +++ b/integration/scripts/functions_qemu @@ -56,7 +56,6 @@ function build_guest_image() { pushd $TEMP > /dev/null elementes="$elementes ${guest_os}" - elementes="$elementes pip-and-virtualenv" elementes="$elementes pip-cache" elementes="$elementes guest-agent" elementes="$elementes ${guest_os}-docker" |