Skip to content

Commit

Permalink
Docker: Install python-matrix-runner from PyPI.
Browse files Browse the repository at this point in the history
  • Loading branch information
JonatanAntoni committed Jul 14, 2021
1 parent 999d63b commit ff2e43a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions docker/dockerfile.gnu
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ ARG INSTALLER_PATH=/tmp/dependenciesFiles
RUN mkdir -p ${INSTALLER_PATH}
COPY dependenciesFiles/${GCC} ${INSTALLER_PATH}/${GCC}
COPY dependenciesFiles/buildtools ${TOOLS_PATH}/buildtools
COPY dependenciesFiles/python-matrix-runner ${INSTALLER_PATH}/python-matrix-runner

# install & setup gcc
RUN mkdir -p ${TOOLS_PATH}
Expand All @@ -56,9 +55,6 @@ RUN python3 -m pip install --no-cache-dir -r ${TOOLS_PATH}/buildtools/requiremen
COPY rtebuild /root/.rtebuild
ENV PATH=${PATH}:${TOOLS_PATH}/buildtools

# install python-matrix-runner
# hadolint disable=DL3013
RUN python3 -m pip install ${INSTALLER_PATH}/python-matrix-runner

# remove dependency folder
RUN rm -rf ${INSTALLER_PATH}
Expand Down
1 change: 0 additions & 1 deletion docker/getDependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,5 @@ downloadFromDepot "fvp-11.12-linux-x86_64.tar.gz"
downloadFromArtifactory "mcu.promoted/staging/devtools/tools/packchk/${PACKCHK_VERSION}/linux64/PackChk"

gitClone "ssh://${USER}@eu-gerrit-1.euhpc.arm.com:29418/dsg/cmsis/buildtools" "buildtools" "master"
gitClone "ssh://${USER}@eu-gerrit-1.euhpc.arm.com:29418/scratch/jonant01/python-matrix-runner" "python-matrix-runner" "master"

popd || exit
1 change: 1 addition & 0 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ junit-xml~=1.9
jira~=2.0
junitparser~=1.4
Jinja2~=2.11
python-matrix-runner~=1.0

0 comments on commit ff2e43a

Please sign in to comment.