Skip to content

Commit 0270f15

Browse files
dustymabejlebon
authored andcommitted
test-override: use new get_source_config_for_stream()
This was done in [1] so we much update the function call here. [1] coreos/fedora-coreos-pipeline@b143caa
1 parent ce363ee commit 0270f15

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

jobs/test-override.Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,18 +185,18 @@ try {
185185
}
186186
}
187187

188-
def branch = pipeutils.get_source_config_ref_for_stream(pipecfg, params.STREAM)
188+
def (url, branch) = pipeutils.get_source_config_for_stream(pipecfg, params.STREAM)
189189
def src_config_commit = ""
190190
if (build_lock == "") {
191191
src_config_commit = shwrapCapture("""
192-
git ls-remote ${pipecfg.source_config.url} refs/heads/${branch} | cut -d \$'\t' -f 1
192+
git ls-remote ${url} refs/heads/${branch} | cut -d \$'\t' -f 1
193193
""")
194194
} else {
195195
def meta_raw = shwrapCapture("curl -sSL https://builds.coreos.fedoraproject.org/prod/streams/${params.STREAM}/builds/${build_lock}/x86_64/meta.json")
196196
def meta = readJSON text: meta_raw
197197
src_config_commit = meta["coreos-assembler.config-gitrev"]
198198
}
199-
shwrap("cosa init --branch ${branch} --commit=${src_config_commit} ${pipecfg.source_config.url}")
199+
shwrap("cosa init --branch ${branch} --commit=${src_config_commit} ${url}")
200200

201201
// Initialize the sessions on the remote builders
202202
def archinfo = arches.collectEntries{[it, [session: ""]]}
@@ -209,7 +209,7 @@ try {
209209
""")
210210
withEnv(["COREOS_ASSEMBLER_REMOTE_SESSION=${archinfo[arch]['session']}"]) {
211211
shwrap("""
212-
cosa init --branch ${branch} --commit=${src_config_commit} ${pipecfg.source_config.url}
212+
cosa init --branch ${branch} --commit=${src_config_commit} ${url}
213213
""")
214214
}
215215
}

0 commit comments

Comments
 (0)