diff --git a/jenkins_backend/config.py b/jenkins_backend/config.py index e214154..6670ef0 100644 --- a/jenkins_backend/config.py +++ b/jenkins_backend/config.py @@ -2,6 +2,9 @@ from jenkins_creds import (jenkins_host, jenkins_cred) +# Path to our files +pypath = '/var/lib/jenkins/toaster.do/jenkins_backend' + # Path to jenkins-cli.jar jarpath = '/var/cache/jenkins/war/WEB-INF/jenkins-cli.jar' diff --git a/jenkins_backend/sync_jobs.py b/jenkins_backend/sync_jobs.py index 27cd32b..9666e7c 100755 --- a/jenkins_backend/sync_jobs.py +++ b/jenkins_backend/sync_jobs.py @@ -5,9 +5,10 @@ Module for backend talk with Jenkins executed by the web/CGI from argparse import ArgumentParser from subprocess import run +from os.path import join import html -from config import (jarargs, jobpath) +from config import (jarargs, jobpath, pypath) def add_job(jobname): @@ -36,7 +37,7 @@ def add_job(jobname): ('ARCH', arch), ('COMMAND', command)] - sdk_job = open('toasterbuild.xml', encoding='utf-8').read() + sdk_job = open(join(pypath, 'toasterbuild.xml'), encoding='utf-8').read() for i in replacements: sdk_job = sdk_job.replace('{{{%s}}}' % i[0], i[1])