Skip to content

Commit 07a689d

Browse files
jlebondustymabe
authored andcommitted
jobs/test-override: respect env vars for stream
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.
1 parent ee4a162 commit 07a689d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

jobs/test-override.Jenkinsfile

+4
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ def cosa_img = params.COREOS_ASSEMBLER_IMAGE
6969
cosa_img = cosa_img ?: pipeutils.get_cosa_img(pipecfg, params.STREAM)
7070
def stream_info = pipecfg.streams[params.STREAM]
7171

72+
// Grab any environment variables we should set
73+
def container_env = pipeutils.get_env_vars_for_stream(pipecfg, params.STREAM)
74+
7275
// Keep in sync with build.Jenkinsfile
7376
def cosa_memory_request_mb = 10.5 * 1024 as Integer
7477
def ncpus = ((cosa_memory_request_mb - 512) / 1536) as Integer
@@ -77,6 +80,7 @@ currentBuild.description = "[${descPrefix}] Pending"
7780

7881
cosaPod(image: cosa_img,
7982
cpu: "${ncpus}", memory: "${cosa_memory_request_mb}Mi",
83+
env: container_env,
8084
serviceAccount: "jenkins") {
8185
timeout(time: 150, unit: 'MINUTES') {
8286
try {

0 commit comments

Comments
 (0)