TF-M: Moves venv location to buildslave area
Change-Id: Icd3715ca44c78f202aca08dec0fe85e9afa0a44e
Signed-off-by: Matthew Dalzell <matthew.dalzell@arm.com>
diff --git a/jammy-amd64-tf-m-build/Dockerfile b/jammy-amd64-tf-m-build/Dockerfile
index 674a38f..4fb50d0 100644
--- a/jammy-amd64-tf-m-build/Dockerfile
+++ b/jammy-amd64-tf-m-build/Dockerfile
@@ -94,6 +94,12 @@
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash ;\
apt update -q=2 ;\
apt install -q=2 --yes --no-install-recommends git-lfs ;\
+ # Setup buildslave user for Jenkins
+ useradd -m -s /bin/bash buildslave ;\
+ echo "buildslave:$BUILDSLAVE_PASSWORD" | chpasswd ;\
+ echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins ;\
+ chmod 0440 /etc/sudoers.d/jenkins ;\
+ mkdir -p /var/run/sshd ${TOOLS_DIR} ${COMPILER_DIR};\
# Install Python requirements
curl -s https://bootstrap.pypa.io/pip/3.5/get-pip.py -o /tmp/get-pip.py ;\
python2 /tmp/get-pip.py ;\
@@ -101,11 +107,10 @@
# Python3
python3 /tmp/get-pip.py ;\
pip3 install --no-cache-dir -r /opt/requirements_python3.txt ;\
- python3 -m venv .venv;\
- . .venv/bin/activate;\
+ python3 -m venv /home/buildslave/.venv;\
+ . /home/buildslave/.venv/bin/activate;\
pip install /opt/;\
pip install -r /opt/requirements_python3.txt; \
-
# Currently the venv support, and therefore the pyproject.toml file has not
# been added to TF-M yet, the following is the code which will be used for
# that, but wil remain dormant until it can be used.
@@ -113,13 +118,6 @@
#pip install -r ./trusted-firmware-m/pyproject.toml;\
#pip install trusted-firmware-m/."[docs]";\
#rm -rf trusted-firmware-m/;\
- # Setup buildslave user for Jenkins
-
- useradd -m -s /bin/bash buildslave ;\
- echo "buildslave:$BUILDSLAVE_PASSWORD" | chpasswd ;\
- echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins ;\
- chmod 0440 /etc/sudoers.d/jenkins ;\
- mkdir -p /var/run/sshd ${TOOLS_DIR} ${COMPILER_DIR};\
# Run shell script(s) to install files, toolchains, etc...
bash -ex /tmp/tf-dependencies.install ;\
bash -ex /tmp/tf-environment.install ;\