Skip to content

Commit

Permalink
jobs/test-override: respect env vars for stream
Browse files Browse the repository at this point in the history
This matches what we do in the pipeline.

Motivated by wanting to get to the bottom of
coreos/fedora-coreos-tracker#1796, which
happens often in the Bodhi tests.
  • Loading branch information
jlebon authored and dustymabe committed Oct 29, 2024
1 parent ee4a162 commit 07a689d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions jobs/test-override.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ def cosa_img = params.COREOS_ASSEMBLER_IMAGE
cosa_img = cosa_img ?: pipeutils.get_cosa_img(pipecfg, params.STREAM)
def stream_info = pipecfg.streams[params.STREAM]

// Grab any environment variables we should set
def container_env = pipeutils.get_env_vars_for_stream(pipecfg, params.STREAM)

// Keep in sync with build.Jenkinsfile
def cosa_memory_request_mb = 10.5 * 1024 as Integer
def ncpus = ((cosa_memory_request_mb - 512) / 1536) as Integer
Expand All @@ -77,6 +80,7 @@ currentBuild.description = "[${descPrefix}] Pending"

cosaPod(image: cosa_img,
cpu: "${ncpus}", memory: "${cosa_memory_request_mb}Mi",
env: container_env,
serviceAccount: "jenkins") {
timeout(time: 150, unit: 'MINUTES') {
try {
Expand Down

0 comments on commit 07a689d

Please sign in to comment.