Skip to content

Commit 71bbc5e

Browse files
dustymabejlebon
authored andcommitted
drop ostree repo import for F43+
Part of coreos/fedora-coreos-tracker#1895
1 parent 6746d2d commit 71bbc5e

File tree

3 files changed

+35
-14
lines changed

3 files changed

+35
-14
lines changed

jobs/build-arch.Jenkinsfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,15 @@ lock(resource: "build-${params.STREAM}-${basearch}") {
373373
parallelruns['Sign Images'] = {
374374
pipeutils.signImages(params.STREAM, newBuildID, basearch, s3_stream_dir)
375375
}
376-
parallelruns['OSTree Import: Compose Repo'] = {
377-
pipeutils.composeRepoImport(newBuildID, basearch, s3_stream_dir)
376+
// Import into the OSTree repo if we are F42. We stopped
377+
// doing this for F43+ because we distribute updates from
378+
// the container registry now.
379+
if (newBuildID.tokenize('.')[0] == '42') {
380+
parallelruns['OSTree Import: Compose Repo'] = {
381+
pipeutils.composeRepoImport(newBuildID, basearch, s3_stream_dir)
382+
}
383+
} else {
384+
echo "Skipping OSTree repo import for F43+"
378385
}
379386
// process this batch
380387
parallel parallelruns

jobs/build.Jenkinsfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,15 @@ lock(resource: "build-${params.STREAM}") {
457457
parallelruns['Sign Images'] = {
458458
pipeutils.signImages(params.STREAM, newBuildID, basearch, s3_stream_dir)
459459
}
460-
parallelruns['OSTree Import: Compose Repo'] = {
461-
pipeutils.composeRepoImport(newBuildID, basearch, s3_stream_dir)
460+
// Import into the OSTree repo if we are F42. We stopped
461+
// doing this for F43+ because we distribute updates from
462+
// the container registry now.
463+
if (newBuildID.tokenize('.')[0] == '42') {
464+
parallelruns['OSTree Import: Compose Repo'] = {
465+
pipeutils.composeRepoImport(newBuildID, basearch, s3_stream_dir)
466+
}
467+
} else {
468+
echo "Skipping OSTree repo import for F43+"
462469
}
463470
// process this batch
464471
parallel parallelruns

jobs/release.Jenkinsfile

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,24 @@ lock(resource: "release-${params.STREAM}", extra: locks) {
178178
// For production streams, import the OSTree into the prod
179179
// OSTree repo.
180180
if (stream_info.type == 'production') {
181-
pipeutils.tryWithMessagingCredentials() {
182-
stage("OSTree Import ${basearch}: Prod Repo") {
183-
shwrap("""
184-
/usr/lib/coreos-assembler/fedmsg-send-ostree-import-request \
185-
--build=${params.VERSION} --arch=${basearch} \
186-
--s3=${s3_stream_dir} --repo=prod \
187-
--fedmsg-conf=\${FEDORA_MESSAGING_CONF}
188-
""")
189-
}
181+
// Import into the OSTree repo if we are F42. We stopped
182+
// doing this for F43+ because we distribute updates from
183+
// the container registry now.
184+
if (params.VERSION.tokenize('.')[0] == '42') {
185+
pipeutils.tryWithMessagingCredentials() {
186+
stage("OSTree Import ${basearch}: Prod Repo") {
187+
shwrap("""
188+
/usr/lib/coreos-assembler/fedmsg-send-ostree-import-request \
189+
--build=${params.VERSION} --arch=${basearch} \
190+
--s3=${s3_stream_dir} --repo=prod \
191+
--fedmsg-conf=\${FEDORA_MESSAGING_CONF}
192+
""")
193+
}
190194

191-
ostree_prod_refs[meta.ref] = meta["ostree-commit"]
195+
ostree_prod_refs[meta.ref] = meta["ostree-commit"]
196+
}
197+
} else {
198+
echo "Skipping OSTree repo import for F43+"
192199
}
193200
}
194201

0 commit comments

Comments
 (0)