@@ -38,7 +38,7 @@ def generate_diskvar_json(shortcommit, arch, artifacts, staging_repo, repo) {
38
38
"container-tag": "${arch}-${shortcommit}",
39
39
"extra-kargs-string": "",
40
40
"image-type": "${artifact["platform"]}",
41
- "container-imgref": "ostree-remote-registry:fedora:${repo}:5.1 ",
41
+ "container-imgref": "ostree-remote-registry:fedora:${repo}:${version} ",
42
42
"metal-image-size": "3072",
43
43
"cloud-image-size": "10240",
44
44
"deploy-via-container": "true",
@@ -71,10 +71,18 @@ properties([
71
71
description: 'Space-separated list of target architectures',
72
72
defaultValue: "x86_64 aarch64",
73
73
trim: true),
74
+ string(name: 'PODMAN_GIT_URL',
75
+ description: 'Podman git repo',
76
+ defaultValue: "https://github.com/containers/podman",
77
+ trim: true),
74
78
string(name: 'PODMAN_MACHINE_GIT_URL',
75
79
description: 'Override the coreos-assembler git repo to use',
76
80
defaultValue: "https://github.com/containers/podman-machine-os",
77
81
trim: true),
82
+ string(name: 'PODMAN_VERSION',
83
+ description: 'Podman version',
84
+ defaultValue: "main",
85
+ trim: true),
78
86
string(name: 'PODMAN_MACHINE_GIT_REF',
79
87
description: 'Override the coreos-assembler git ref to use',
80
88
defaultValue: "main",
@@ -123,6 +131,22 @@ def ncpus = ((cosa_memory_request_mb - 512) / 1536) as Integer
123
131
124
132
125
133
node {
134
+ change = checkout(
135
+ changelog: true,
136
+ poll: false,
137
+ scm: [
138
+ $class: 'GitSCM',
139
+ branches: [[name: "origin/main"]],
140
+ userRemoteConfigs: [[url: params.PODMAN_GIT_URL]],
141
+ extensions: [[$class: 'CloneOption',
142
+ noTags: true,
143
+ reference: '',
144
+ shallow: true]]
145
+ ]
146
+ )
147
+
148
+ def version = shwrapCapture("grep '^const RawVersion' version/rawversion/version.go | cut -d\" -f2")
149
+
126
150
change = checkout(
127
151
changelog: true,
128
152
poll: false,
@@ -254,7 +278,7 @@ lock(resource: "build-podman-os") {
254
278
}
255
279
withCredentials([file(credentialsId: 'podman-push-registry-secret', variable: 'REGISTRY_SECRET')]) {
256
280
stage("Push Manifest") {
257
- def manifest = "${params.CONTAINER_REGISTRY_STAGING_REPO}:5.1 -${shortcommit}"
281
+ def manifest = "${params.CONTAINER_REGISTRY_STAGING_REPO}:${version} -${shortcommit}"
258
282
def cmds = "/usr/bin/buildah manifest create ${manifest}"
259
283
parallel archinfo.keySet().collectEntries{arch -> [arch, {
260
284
def image = "docker://${params.CONTAINER_REGISTRY_STAGING_REPO}:${arch}-${shortcommit}"
@@ -286,8 +310,8 @@ lock(resource: "build-podman-os") {
286
310
// Release the manifest and container images
287
311
shwrap("""
288
312
skopeo copy --all --authfile \$REGISTRY_SECRET \
289
- docker://${params.CONTAINER_REGISTRY_STAGING_REPO}:5.1 -${shortcommit} \
290
- docker://${params.CONTAINER_REGISTRY_REPO}:5.1
313
+ docker://${params.CONTAINER_REGISTRY_STAGING_REPO}:${version} -${shortcommit} \
314
+ docker://${params.CONTAINER_REGISTRY_REPO}:${version}
291
315
""")
292
316
}
293
317
}
@@ -298,7 +322,7 @@ lock(resource: "build-podman-os") {
298
322
shwrap("""
299
323
export STORAGE_DRIVER=vfs # https://github.com/coreos/fedora-coreos-pipeline/issues/723#issuecomment-1297668507
300
324
skopeo delete --authfile=\$REGISTRY_SECRET \
301
- docker://${params.CONTAINER_REGISTRY_STAGING_REPO}:5.1 -${shortcommit}
325
+ docker://${params.CONTAINER_REGISTRY_STAGING_REPO}:${version} -${shortcommit}
302
326
""")
303
327
}
304
328
parallel archinfo.keySet().collectEntries{arch -> [arch, {
0 commit comments