From f6ec993ed627bc62177ad7b015d7b0d90557d71d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 11 Oct 2022 10:07:02 -0400
Subject: [PATCH 1/4] upgrade: Warn and sleep if we find a deprecated v0 format
 container

This is prep for https://github.com/ostreedev/ostree-rs-ext/issues/332
---
 rust/src/sysroot_upgrade.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rust/src/sysroot_upgrade.rs b/rust/src/sysroot_upgrade.rs
index 8e29cc2036..75f0f22bf1 100644
--- a/rust/src/sysroot_upgrade.rs
+++ b/rust/src/sysroot_upgrade.rs
@@ -84,6 +84,10 @@ async fn pull_container_async(
         PrepareResult::AlreadyPresent(r) => return Ok(r.into()),
         PrepareResult::Ready(r) => r,
     };
+    if prep.export_layout == ostree_container::ExportLayout::V0 {
+        output_message(&format!("warning: pulled image is using deprecated v0 format; support will be dropped in a future release"));
+        std::thread::sleep(std::time::Duration::from_secs(5));
+    }
     let progress_printer =
         tokio::task::spawn(async move { layer_progress_print(layer_progress).await });
     let digest = prep.manifest_digest.clone();

From b789bda19c819034c063e903deb91ca005860244 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 11 Oct 2022 15:41:10 -0400
Subject: [PATCH 2/4] ci: Request more memory for RPM building

We've switching to also setting a memory limit in coreos-ci-lib:
https://github.com/coreos/coreos-ci-lib/pull/116

It looks like we're not requesting enough memory for the RPM build.
Let's bump it to 4Gi and lower parallelism by 1.
---
 .cci.jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index a83d2532c9..09c2dd7d27 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -2,8 +2,8 @@
 
 stage("Build") {
 parallel rpms: {
-  def n = 5
-  buildPod(memory: "2Gi", cpu: "${n}") {
+  def n = 4
+  buildPod(memory: "4Gi", cpu: "${n}") {
       checkout scm
       // 2:1 job to CPU at most should keep us from getting kicked out
       shwrap("""RPM_BUILD_NCPUS=${n} CARGO_BUILD_JOBS=${n} ./ci/coreosci-rpmbuild.sh""")

From bd5e07054599881b50751e620c92709dd19653d6 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 11 Oct 2022 17:34:07 -0400
Subject: [PATCH 3/4] tests: Bump memory requests to work around Fedora
 repodata size

xref https://github.com/coreos/fedora-coreos-config/commit/3dee27d
---
 tests/kolainst/destructive/layering-fedorainfra | 2 +-
 tests/kolainst/destructive/layering-modules     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/kolainst/destructive/layering-fedorainfra b/tests/kolainst/destructive/layering-fedorainfra
index 520447ddc9..d83e4f1cf9 100755
--- a/tests/kolainst/destructive/layering-fedorainfra
+++ b/tests/kolainst/destructive/layering-fedorainfra
@@ -1,5 +1,5 @@
 #!/bin/bash
-# kola: { "tags": "needs-internet" }
+# kola: { "tags": "needs-internet", "minMemory": 1536 }
 # Test https://github.com/coreos/rpm-ostree/pull/2420
 # i.e. using overrides from Fedora Infrastructure tools (koji/bodhi)
 set -euo pipefail
diff --git a/tests/kolainst/destructive/layering-modules b/tests/kolainst/destructive/layering-modules
index e6527bb618..84804f85dc 100755
--- a/tests/kolainst/destructive/layering-modules
+++ b/tests/kolainst/destructive/layering-modules
@@ -1,5 +1,5 @@
 #!/bin/bash
-# kola: { "tags": "needs-internet" }
+# kola: { "tags": "needs-internet", "minMemory": 1536 }
 set -euo pipefail
 
 . ${KOLA_EXT_DATA}/libtest.sh

From 58422f6fcbdaa79633fcae6c25f1265fc30cc974 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 11 Oct 2022 18:57:08 -0400
Subject: [PATCH 4/4] ci: Adjust limits for bumping memory

We desperately want https://github.com/coreos/coreos-assembler/issues/1438
---
 .cci.jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 09c2dd7d27..1f5ff3e802 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -24,8 +24,8 @@ codestyle: {
 }
 }
 
-def nhosts = 5
-def mem = (nhosts * 1024) + 512
+def nhosts = 4
+def mem = (nhosts * 1536) + 512
 cosaPod(runAsUser: 0, memory: "${mem}Mi", cpu: "${nhosts}") {
   stage("Unit Tests") {
     checkout scm
@@ -60,7 +60,7 @@ cosaPod(runAsUser: 0, memory: "${mem}Mi", cpu: "${nhosts}") {
   }
   stage("vmcheck") {
     try {
-      timeout(time: 30, unit: 'MINUTES') {
+      timeout(time: 45, unit: 'MINUTES') {
         shwrap("COSA_DIR=${env.WORKSPACE} JOBS=${nhosts} tests/vmcheck.sh")
       }
     } finally {