update

config/jenkins/config.xml

@@ -10,6 +10,7 @@
   <useSecurity>true</useSecurity>
   <authorizationStrategy class="hudson.security.ProjectMatrixAuthorizationStrategy">
     <permission>hudson.model.Hudson.Administer:{USERNAME}</permission>
+    <permission>hudson.model.Hudson.Administer:api</permission>
     <permission>hudson.model.Hudson.Read:authenticated</permission>
   </authorizationStrategy>
   <securityRealm class="org.jenkinsci.plugins.oic.OicSecurityRealm" plugin="oic-auth@1.4">

openshiftTemplate.yml

@@ -34,6 +34,8 @@ objects:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          - name: JENKINS_API_PASSWORD
+            value: ${JENKINS_API_PASSWORD}
           - name: ADMIN_FIRST_NAME
             value: ${ADMIN_FIRST_NAME}
           - name: ADMIN_LAST_NAME
@@ -439,8 +441,8 @@ objects:
           - name: ENABLE_FATAL_ERROR_LOG_FILE
             value: 'false'
           volumeMounts:
-            - name: jenkins-volume
-              mountPath: /var/lib/jenkins
+          - name: jenkins-volume
+            mountPath: /var/lib/jenkins
           terminationMessagePath: /dev/termination-log
           securityContext:
             capabilities: {}
@@ -792,7 +794,7 @@ parameters:
 
 - displayName: git base path
   description: this url is for the initcontainer
-  value: 'https://raw.githubusercontent.com/lukas15442/open-space/master/openshift/initcontainer/config'
+  value: 'https://code.fbi.h-da.de/SS18-REP-PAD2/Config/raw/master/config'
   required: true
   name: GIT_URL
 
@@ -872,5 +874,11 @@ parameters:
   generate: expression
   required: true
 
+- displayName: Jenkins API Password
+  name: JENKINS_API_PASSWORD
+  from: '[a-zA-Z0-9]{8}'
+  generate: expression
+  required: true
+
 
 

validationScripts/validate.py

@@ -8,16 +8,18 @@ from jenkins import JenkinsException
 
 DEBUG = False
 
-PIPELINE_CONFIG_URL = 'https://raw.githubusercontent.com/lukas15442/open-space/master/jenkins/pipelines/PipelineConfig.xml'
+PIPELINE_CONFIG_URL = 'https://code.fbi.h-da.de/SS18-REP-PAD2/Config/raw/master/pipelines/PipelineConfig.xml'
 
-PIPELINE_REPO = 'https://github.com/lukas15442/open-space.git'
-PIPELINE_BASE = 'jenkins/pipelines'
+PIPELINE_REPO = 'https://code.fbi.h-da.de/SS18-REP-PAD2/Config.git'
+PIPELINE_BASE = 'pipelines'
 JENKINSFILE_NAME = 'jenkinsfile.groovy'
 
 JENKINS_URL = 'https://jenkins-open-submit.apps.ocp.fbi.h-da.de'
 JENKINS_USERNAME = 'api'
 JENKINS_SECRET = os.environ['JENKINS_API_TOKEN']
 
+print (os.environ['JENKINS_API_TOKEN'])
+
 # Parameter that will be filled when debug is off
 USERNAME = 'istlukoeh'
 COURSE = 'PAD1'