Browse Source

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)
changes/62/782862/1
Lingxian Kong 3 months ago
parent
commit
ed5c5f962d
4 changed files with 8 additions and 7 deletions
  1. +0
    -1
      integration/scripts/files/elements/guest-agent/element-deps
  2. +1
    -1
      integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/31-guest-agent-install
  3. +7
    -4
      integration/scripts/files/elements/guest-agent/package-installs.yaml
  4. +0
    -1
      integration/scripts/functions_qemu

+ 0
- 1
integration/scripts/files/elements/guest-agent/element-deps View File

@ -3,5 +3,4 @@ package-installs
pkg-map
source-repositories
svc-map
pip-and-virtualenv
ubuntu-docker

+ 1
- 1
integration/scripts/files/elements/guest-agent/install.d/guest-agent-source-install/31-guest-agent-install View File

@ -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}


+ 7
- 4
integration/scripts/files/elements/guest-agent/package-installs.yaml View File

@ -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:

+ 0
- 1
integration/scripts/functions_qemu View File

@ -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"


Loading…
Cancel
Save