From 24e82566e272e5105afe3092a93ae715ad72ef34 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Tue, 21 Apr 2020 00:16:39 +0100
Subject: [PATCH] [Jenkins] update config with FINN_CI_BRANCH
---
docker/Jenkinsfile | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/docker/Jenkinsfile b/docker/Jenkinsfile
index a43a296a2..1fba7afd4 100644
--- a/docker/Jenkinsfile
+++ b/docker/Jenkinsfile
@@ -1,17 +1,21 @@
pipeline {
agent any
+ parameters {
+ string(name: 'FINN_CI_BRANCH', defaultValue: 'feature/docker_reorg', description: '')
+ }
environment {
+ FINN_CI_BRANCH='feature/docker_reorg'
VIVADO_PATH='/opt/Xilinx/Vivado/2019.1'
- DOCKER_TAG='finn_ci'
- DOCKER_INST_NAME='finn_ci'
+ DOCKER_TAG='finn_ci:$BUILD_ID'
+ DOCKER_INST_NAME='finn_ci_$BUILD_ID'
BUILD_PATH='/tmp/finn_ci'
VIVADO_IP_CACHE='$BUILD_PATH/vivado_ip_cache'
- DOCKER_CMD="source /root/.bashrc; python setup.py test"
+ DOCKER_CMD="source /root/.bashrc; python setup.py test --addopts '-k test_compilation_trafo'"
}
stages {
stage("Clone") {
steps {
- git branch: 'feature/docker_reorg', url: 'https://github.com/Xilinx/finn.git'
+ git branch: "${params.FINN_CI_BRANCH}", url: 'https://github.com/Xilinx/finn.git'
}
}
stage('Build') {
@@ -19,6 +23,7 @@ pipeline {
sh """
docker build --no-cache -t $DOCKER_TAG -f docker/Dockerfile.finn_ci \
--build-arg BUILD_PATH=$BUILD_PATH \
+ --build-arg FINN_CI_BRANCH=$FINN_CI_BRANCH \
--build-arg VIVADO_PATH=$VIVADO_PATH \
docker/
"""
--
GitLab