From a89961cf8b0c201870af458cde79597ae01928f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20K=C3=B6hler?= <lukas.koehler@h-da.de>
Date: Mon, 27 Aug 2018 16:17:53 +0200
Subject: [PATCH] new validation script and new openshift template
---
openshiftTemplate.yml | 4 ++--
validationScripts/validate.py | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/openshiftTemplate.yml b/openshiftTemplate.yml
index b3cd6de..5d9fa5d 100644
--- a/openshiftTemplate.yml
+++ b/openshiftTemplate.yml
@@ -441,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: {}
diff --git a/validationScripts/validate.py b/validationScripts/validate.py
index c7bc95b..6c82d9e 100644
--- a/validationScripts/validate.py
+++ b/validationScripts/validate.py
@@ -1,10 +1,9 @@
import os
import time
-from urllib import parse, request
-
import urllib3
from jenkins import Jenkins
from jenkins import JenkinsException
+from urllib import parse, request
DEBUG = False
@@ -38,7 +37,9 @@ def validate(job):
job.working_dir = os.popen(
'find ' + FOLDER + ' -maxdepth 1 -type d -not -path ' + FOLDER + '/__pycache__ -not -path ' + FOLDER + '') \
.read()[0:-1] + '/'
- job.run_make(mandatory=True)
+ for fname in os.listdir('.'):
+ if fname.endswith('Makefile'):
+ job.run_make(mandatory=True)
server = Jenkins(JENKINS_URL, JENKINS_USERNAME, JENKINS_SECRET)
create_pipeline(server)
--
GitLab