Lubuntu/ci-tooling
8
0
Fork 0
mirror of https://github.com/lubuntu-team/ci-tooling.git synced 2025-06-09 15:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split Jenkins authentication into a different function.

Browse Source
This commit is contained in:
Simon Quigley 2019-03-08 11:34:36 -06:00
parent 8f85fe5eca
commit ae7eec1330
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ci/jobgenerator.py
View File

@ -87,6 +87,26 @@ class Generator:
return metadata_conf["repositories"] return metadata_conf["repositories"]
def auth_jenkins_server(self):
"""Authenticate to the Jenkins server
This involves use of the API_SITE, API_USER, and API_KEY variables
set in Jenkins. These need to be private, so they are defined in the
system-wide Jenkins credential storage.
"""
# Load the API values from the environment variables
api_site = getenv("API_SITE")
api_user = getenv("API_USER")
api_key = getenv("API_KEY")
for envvar in [api_site, api_user, api_key]:
if not envvar or envvar == "":
raise ValueError("API_SITE, API_USER, and API_KEY must be",
"defined")
# Authenticate to the server
server = Jenkins(api_site, username=api_user, password=api_key)
return server
def create_jenkins_jobs(self): def create_jenkins_jobs(self):
"""Interface with Jenkins to create the jobs required """Interface with Jenkins to create the jobs required
@ -98,20 +118,10 @@ class Generator:
longer defined, remove them. longer defined, remove them.
3. Update the per-release views to ensure the jobs are in the correct 3. Update the per-release views to ensure the jobs are in the correct
views. If there are any releases no longer defined, remove them. views. If there are any releases no longer defined, remove them.
It involves use of the API_SITE, API_USER, and API_KEY variables from
Jenkins. These need to be private, so they are defined in the
system-wide Jenkins credential storage.
""" """
# Load the API values from the environment variables # Authenticate to the Jenkins server
api_site = getenv("API_SITE") server = self.auth_jenkins_server()
api_user = getenv("API_USER")
api_key = getenv("API_KEY")
for envvar in [api_site, api_user, api_key]:
if not envvar or envvar == "":
raise ValueError("API_SITE, API_USER, and API_KEY must be",
"defined")
# Assign the packagebuild template to a variable # Assign the packagebuild template to a variable
with open("templates/packagebuild.xml") as templatef: with open("templates/packagebuild.xml") as templatef:
@ -120,9 +130,6 @@ class Generator:
template += text template += text
template = Template(template) template = Template(template)
# Authenticate to the server
server = Jenkins(api_site, username=api_user, password=api_key)
# Iterate through the packages we have in our metadata and update the # Iterate through the packages we have in our metadata and update the
# job config for each if they match. If there's no existing job found, # job config for each if they match. If there's no existing job found,
# just create it # just create it