Skip to content

Commit

Permalink
pipeline: split out streams.groovy module
Browse files Browse the repository at this point in the history
This module will hold the canonical definition for all our streams. This
in effect also adds `testing-devel` and `bodhi-updates` to the list of
supported streams.
  • Loading branch information
jlebon committed Jun 17, 2019
1 parent 62091fd commit 577508a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
10 changes: 4 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
def pod, utils, prod, prod_jenkins, devel_prefix, src_config_url, src_config_ref, s3_bucket
def utils, streams, prod, prod_jenkins, devel_prefix, src_config_url, src_config_ref, s3_bucket
node {
checkout scm
pod = readFile(file: "manifests/pod.yaml")
utils = load("utils.groovy")
streams = load("streams.groovy")
pod = readFile(file: "manifests/pod.yaml")

// just autodetect if we're in prod or not
prod_jenkins = (env.JENKINS_URL == 'https://jenkins-fedora-coreos.apps.ci.centos.org/')
Expand Down Expand Up @@ -34,10 +35,7 @@ properties([
pipelineTriggers(prod ? [cron("H/30 * * * *")] : []),
parameters([
choice(name: 'STREAM',
// XXX: Just pretend we're the testing stream for now... in
// reality, we're closer to what "bodhi-updates" will be. Though the
// testing stream is the main stream.
choices: ['testing' /*, 'stable', 'testing-devel', 'bodhi-updates', etc... */ ],
choices: (streams.prod + streams.devel + streams.mechanical),
description: 'Fedora CoreOS stream to build',
required: true),
booleanParam(name: 'FORCE',
Expand Down
7 changes: 7 additions & 0 deletions streams.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Canonical definition of all our streams and their type.

prod = ['testing' /* , 'stable', 'next' */]
devel = ['testing-devel' /* , 'next-devel' */]
mechanical = ['bodhi-updates' /* , 'bodhi-updates-testing', 'branched', 'rawhide' */]

return this

0 comments on commit 577508a

Please sign in to comment.