diff --git a/config/jenkins/config.xml b/config/jenkins/config.xml index 0ac8c712a6706e4611c150cd356fa81c392e85ab..32ececed6cbde1041f6b8f4150a34a4d7bb793d8 100644 --- a/config/jenkins/config.xml +++ b/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"> diff --git a/openshiftTemplate.yml b/openshiftTemplate.yml index 88a66561edbaa67fe2fc77b67685bb6317ac22be..b3cd6de2d3796acaae6d38c02ace02e5f5a69ad8 100644 --- a/openshiftTemplate.yml +++ b/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 + diff --git a/testing/testingBuildFailed.zip b/testing/testingBuildFailed.zip new file mode 100644 index 0000000000000000000000000000000000000000..5b423a3ee7ff6d21c3ab2e606f939563833ddcf6 Binary files /dev/null and b/testing/testingBuildFailed.zip differ diff --git a/testing/testingSuccess.zip b/testing/testingSuccess.zip new file mode 100644 index 0000000000000000000000000000000000000000..e1f7e83bccfde21a0d40fc1c21705b473019c0e8 Binary files /dev/null and b/testing/testingSuccess.zip differ diff --git a/testing/testingWithoutBuildFailed.zip b/testing/testingWithoutBuildFailed.zip new file mode 100644 index 0000000000000000000000000000000000000000..537e5d2f46ff930767b36b4e985876883d84f4af Binary files /dev/null and b/testing/testingWithoutBuildFailed.zip differ diff --git a/validationScripts/validate.py b/validationScripts/validate.py index 77fcb238fd1599ff66c8867981ed96f77cb53e1a..c7bc95be8e3a19efef58f740fc9535917d055a78 100644 --- a/validationScripts/validate.py +++ b/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'