Skip to content
Snippets Groups Projects
Commit 3a2db0ee authored by Joshua Colp's avatar Joshua Colp Committed by Joshua C. Colp
Browse files

CI: Use tmpfs option to Docker instead of mount.

Some tests require Asterisk to execute scripts which
are stored in /tmp. When mount is used for tmpfs there
is no ability to allow scripts to be executed from
that location.

This change switches to using tmpfs which can be told
to allow executables to be run from /tmp.

Change-Id: I0e598ca2b76af1f7f2d29f0da7b1731a214a291a
parent b327b0bb
No related branches found
No related tags found
No related merge requests found
...@@ -139,7 +139,7 @@ pipeline { ...@@ -139,7 +139,7 @@ pipeline {
def randomImage = env.DOCKER_REGISTRY + "/" + ri def randomImage = env.DOCKER_REGISTRY + "/" + ri
/* FYI... Jenkins takes care of mouting the workspace for the container */ /* FYI... Jenkins takes care of mouting the workspace for the container */
def dockerOptions = "--privileged --ulimit core=0 --ulimit nofile=10240 " + def dockerOptions = "--privileged --ulimit core=0 --ulimit nofile=10240 " +
" --mount type=tmpfs,tmpfs-size=1g,dst=/tmp -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " + " --tmpfs /tmp:exec,size=1G -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " +
" --entrypoint=''" " --entrypoint=''"
def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-') def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
def outputdir = "tests/CI/output/Testsuite" def outputdir = "tests/CI/output/Testsuite"
......
...@@ -50,7 +50,7 @@ pipeline { ...@@ -50,7 +50,7 @@ pipeline {
def ri = images[(int)r] def ri = images[(int)r]
def randomImage = env.DOCKER_REGISTRY + "/" + ri def randomImage = env.DOCKER_REGISTRY + "/" + ri
def dockerOptions = "--privileged --ulimit core=0 --ulimit nofile=10240 " + def dockerOptions = "--privileged --ulimit core=0 --ulimit nofile=10240 " +
" --mount type=tmpfs,tmpfs-size=1g,dst=/tmp -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " + " --tmpfs /tmp:exec,size=1G -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " +
" --entrypoint=''" " --entrypoint=''"
def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-') def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
def outputdir = "tests/CI/output/Testsuite" def outputdir = "tests/CI/output/Testsuite"
......
...@@ -50,7 +50,7 @@ pipeline { ...@@ -50,7 +50,7 @@ pipeline {
def ri = images[(int)r] def ri = images[(int)r]
def randomImage = env.DOCKER_REGISTRY + "/" + ri def randomImage = env.DOCKER_REGISTRY + "/" + ri
def dockerOptions = "--privileged --ulimit core=0 --ulimit nofile=10240 " + def dockerOptions = "--privileged --ulimit core=0 --ulimit nofile=10240 " +
" --mount type=tmpfs,tmpfs-size=1g,dst=/tmp -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " + " --tmpfs /tmp:exec,size=1G -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " +
" --entrypoint=''" " --entrypoint=''"
def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-') def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
def outputdir = "tests/CI/output/Testsuite" def outputdir = "tests/CI/output/Testsuite"
......
...@@ -141,7 +141,7 @@ pipeline { ...@@ -141,7 +141,7 @@ pipeline {
def randomImage = env.DOCKER_REGISTRY + "/" + ri; def randomImage = env.DOCKER_REGISTRY + "/" + ri;
def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-') def bt = env.BUILD_TAG.replaceAll(/[^a-zA-Z0-9_.-]/, '-')
def dockerOptions = "--privileged --ulimit core=0 --ulimit nofile=10240 " + def dockerOptions = "--privileged --ulimit core=0 --ulimit nofile=10240 " +
" --mount type=tmpfs,tmpfs-size=1g,dst=/tmp -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " + " --tmpfs /tmp:exec,size=1G -v /srv/jenkins:/srv/jenkins:rw -v /srv/cache:/srv/cache:rw " +
" --entrypoint='' --name ${bt}-build" " --entrypoint='' --name ${bt}-build"
def outputdir = "tests/CI/output/UnitTests" def outputdir = "tests/CI/output/UnitTests"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment