diff --git a/openshiftTemplate.yml b/openshiftTemplate.yml index b3cd6de2d3796acaae6d38c02ace02e5f5a69ad8..5d9fa5d4d75d9f41e4d6d1952357a80c5fe631f4 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 c7bc95be8e3a19efef58f740fc9535917d055a78..6c82d9efe8e2a6baf964889b898785dc3ad2f35a 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)