Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade: Warn and sleep if we find a deprecated v0 format container #4084

Merged
merged 4 commits into from
Oct 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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""")
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions rust/src/sysroot_upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion tests/kolainst/destructive/layering-fedorainfra
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/kolainst/destructive/layering-modules
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# kola: { "tags": "needs-internet" }
# kola: { "tags": "needs-internet", "minMemory": 1536 }
set -euo pipefail

. ${KOLA_EXT_DATA}/libtest.sh
Expand Down