Skip to content

Commit

Permalink
Jenkinsfile.*: consistently substitute COREOS_ASSEMBLER_MEMORY_REQUEST
Browse files Browse the repository at this point in the history
We were only doing it in the main Jenkinsfile, but many of the other
ones use the same `pod.yaml` definition so we need to sub out that
variable there too.

In the future, I'd like to switch all jobs over to
[coreos-ci-lib](https://github.com/coreos/coreos-ci-lib) instead to make
this less error-prone and only actually mount the secrets each job
needs.
  • Loading branch information
jlebon committed Oct 15, 2019
1 parent de84970 commit c7497db
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Jenkinsfile.kola.aws
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ currentBuild.description = "[${params.STREAM}] - ${params.VERSION}"
// substitute the right COSA image into the pod definition before spawning it
pod = pod.replace("COREOS_ASSEMBLER_IMAGE", "coreos-assembler:master")

// shouldn't need more than 256Mi for this job
pod = pod.replace("COREOS_ASSEMBLER_MEMORY_REQUEST", "256Mi")

podTemplate(cloud: 'openshift', label: 'coreos-assembler', yaml: pod, defaultContainer: 'jnlp') {
node('coreos-assembler') { container('coreos-assembler') {
def ami, ami_region
Expand Down
3 changes: 3 additions & 0 deletions Jenkinsfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ currentBuild.description = "[${params.STREAM}] - ${params.VERSION}"
// substitute the right COSA image into the pod definition before spawning it
pod = pod.replace("COREOS_ASSEMBLER_IMAGE", "coreos-assembler:master")

// shouldn't need more than 256Mi for this job
pod = pod.replace("COREOS_ASSEMBLER_MEMORY_REQUEST", "256Mi")

podTemplate(cloud: 'openshift', label: 'coreos-assembler', yaml: pod, defaultContainer: 'jnlp') {
node('coreos-assembler') { container('coreos-assembler') {
if (params.AWS_REPLICATION == 'true') {
Expand Down
3 changes: 3 additions & 0 deletions Jenkinsfile.stream.metadata.generator
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ currentBuild.description = "[${params.STREAM}] - ${params.VERSION}"

pod = pod.replace("COREOS_ASSEMBLER_IMAGE", "coreos-assembler:master")

// shouldn't need more than 256Mi for this job
pod = pod.replace("COREOS_ASSEMBLER_MEMORY_REQUEST", "256Mi")

podTemplate(cloud: 'openshift', label: 'coreos-assembler', yaml: pod, defaultContainer: 'jnlp') {
node('coreos-assembler') { container('coreos-assembler') {
stage('Stream Metadata' ) {
Expand Down

0 comments on commit c7497db

Please sign in to comment.