From 31ba27b64dbdac86370d27ab9a48f9e3e83f6c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20K=C3=B6hler?= <lukas.koehler@h-da.de>
Date: Mon, 24 Sep 2018 15:39:11 +0200
Subject: [PATCH] added parameter username
---
pipelines/DB-Airport/Praktikum 1/jenkinsfile.groovy | 1 -
pipelines/PipelineConfig.xml | 2 +-
validationScripts/validate.py | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pipelines/DB-Airport/Praktikum 1/jenkinsfile.groovy b/pipelines/DB-Airport/Praktikum 1/jenkinsfile.groovy
index 6749d9b..3d3e02a 100644
--- a/pipelines/DB-Airport/Praktikum 1/jenkinsfile.groovy
+++ b/pipelines/DB-Airport/Praktikum 1/jenkinsfile.groovy
@@ -32,7 +32,6 @@ pipeline {
stage('Start test') {
steps {
sh('''
- export
echo $STUDENT_DATABASE_URL
echo $STUDENT_DATABASE_NAME
echo $STUDENT_DATABASE_USERNAME
diff --git a/pipelines/PipelineConfig.xml b/pipelines/PipelineConfig.xml
index c8fe34c..f9e0d33 100644
--- a/pipelines/PipelineConfig.xml
+++ b/pipelines/PipelineConfig.xml
@@ -24,7 +24,7 @@
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
- <name>username</name>
+ <name>STUDENT_DATABASE_NAME</name>
<description></description>
<defaultValue></defaultValue>
<trim>false</trim>
diff --git a/validationScripts/validate.py b/validationScripts/validate.py
index 5498fc0..e1d64e3 100644
--- a/validationScripts/validate.py
+++ b/validationScripts/validate.py
@@ -44,7 +44,7 @@ def validate(job):
paramFolder = FOLDER.split('/')[-2]
if paramFolder == "":
paramFolder = FOLDER.split('/')[-3]
- queue_number = server.build_job(JOB_NAME, {'folder': '/opensubmit/' + paramFolder, 'username': USERNAME})
+ queue_number = server.build_job(JOB_NAME, {'folder': '/opensubmit/' + paramFolder, 'STUDENT_DATABASE_NAME': USERNAME})
queue_item = server.get_queue_item(queue_number)
while 'executable' not in queue_item or not queue_item['executable']:
--
GitLab