From d7da11c6d22f5a656d19dace9c7765d0ae2c8c08 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Tue, 21 Apr 2020 01:47:50 +0100
Subject: [PATCH] [Jenkins] allow overriding certain config from envvars
---
docker/Jenkinsfile | 2 +-
docker/launch-jenkins.sh | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/docker/Jenkinsfile b/docker/Jenkinsfile
index 1fba7afd4..3fd841a15 100644
--- a/docker/Jenkinsfile
+++ b/docker/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
VIVADO_PATH='/opt/Xilinx/Vivado/2019.1'
DOCKER_TAG='finn_ci:$BUILD_ID'
DOCKER_INST_NAME='finn_ci_$BUILD_ID'
- BUILD_PATH='/tmp/finn_ci'
+ BUILD_PATH='/tmp/finn_ci_$BUILD_ID'
VIVADO_IP_CACHE='$BUILD_PATH/vivado_ip_cache'
DOCKER_CMD="source /root/.bashrc; python setup.py test --addopts '-k test_compilation_trafo'"
}
diff --git a/docker/launch-jenkins.sh b/docker/launch-jenkins.sh
index 11a1f70f2..fe9faec84 100644
--- a/docker/launch-jenkins.sh
+++ b/docker/launch-jenkins.sh
@@ -1,4 +1,10 @@
#!/bin/bash
+JENKINS_USER ?= jenkins
+JENKINS_PORT ?= 8080
+JENKINS_HOME ?= $(pwd)/jenkins_home
+
+mkdir -p $JENKINS_HOME
+
docker build -t finn_jenkins -f Dockerfile.jenkins .
-docker run -p 8080:8080 -p 50000:50000 -v /var/run/docker.sock:/var/run/docker.sock -v jenkins_home:/var/jenkins_home finn_jenkins
+docker run -u $JENKINS_USER -p $JENKINS_PORT:8080 -v /var/run/docker.sock:/var/run/docker.sock -v $JENKINS_HOME:/var/jenkins_home finn_jenkins
--
GitLab