opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Buildah treadmill: redo the .cirrus.yml tweaks

Browse Source 
Initial purpose of treadmill PR was to run buildah-bud tests
early, and not run anything else if they fail. This was to
catch vendoring problems and not be distracted by flakes.
This was done by inspecting and massaging .cirrus.yml.

As of #21639 this code was a silent NOP because the entire
CI tree was overhauled. Here we make that work again.

Also, in #20947 I enhanced this script to run rootless
bud tests but neglected to updated the comments. Do so now.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2024-10-21 12:38:15 -06:00
parent a925c9f831
commit 9db04e87b6
1 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
hack/buildah-vendor-treadmill
View File

@ -338,14 +338,19 @@ sub pull_main {
} }
############################# #############################
# tweak_cirrus_test_order # Run bud tests first, to fail fast & early # tweak_cirrus_test_order # Two edits to Cirrus tasks
############################# #############################
#
# 1. Run bud tests first, to fail fast & early
# 2. Run rootless bud tests. These don't run in regular CI,
# so this is our only chance to catch problems.
#
sub tweak_cirrus_test_order { sub tweak_cirrus_test_order {
my $cirrus_yml = '.cirrus.yml'; my $cirrus_yml = '.cirrus.yml';
my $tmpfile = "$cirrus_yml.tmp.$$"; my $tmpfile = "$cirrus_yml.tmp.$$";
unlink $tmpfile; unlink $tmpfile;
progress("Tweaking test order in $cirrus_yml to run bud tests early"); progress("Tweaking test order in $cirrus_yml");
open my $in, '<', $cirrus_yml open my $in, '<', $cirrus_yml
or do { or do {
warn "$ME: Cannot read $cirrus_yml: $!\n"; warn "$ME: Cannot read $cirrus_yml: $!\n";
@ -355,39 +360,22 @@ sub tweak_cirrus_test_order {
open my $out, '>'. $tmpfile open my $out, '>'. $tmpfile
or die "$ME: Cannot create $tmpfile: $!\n"; or die "$ME: Cannot create $tmpfile: $!\n";
my $current_task = ''; my $current_task = '';
my $in_depend;
while (my $line = <$in>) { while (my $line = <$in>) {
chomp $line; chomp $line;
if ($line =~ /^(\S+)_task:$/) { if ($line =~ /^(\S+)_task:$/) {
$current_task = $1; $current_task = $1;
undef $in_depend;
} }
elsif ($line =~ /^(\s+)depends_on:$/) { elsif ($line =~ /^(\s+)depends_on:\s+\*build$/) {
$in_depend = $1; # Run the buildah-bud tests early: that's much of the point
}
elsif ($in_depend && $line =~ /^($in_depend\s+-\s+)(\S+)/) {
my $indent = $1;
# Run the buildah-bud tests early: that's the entire point
# of the treadmill PR. Here we switch Cirrus task dependencies # of the treadmill PR. Here we switch Cirrus task dependencies
# such that bud tests run as early as possible. # such that bud tests run as early as possible, and all other
if ($current_task =~ /buildah_bud_test/) { # tests will only run if bud tests pass.
# Buildah bud now depends only on validate... my $indent = $1;
$line = "${indent}validate"; if ($current_task !~ /buildah_bud_test/) {
} $line = "${indent}depends_on:\n${indent} - buildah_bud_test";
elsif ($2 eq 'validate' && $current_task ne 'success') {
# ...and all other tests that relied on validate now rely on
# bud tests instead. The point of the treadmill PR is to
# run the bud tests and only then, if everything passes,
# run normal tests. (Reason: bud tests are the only ones
# likely to fail on a buildah revendor, and we want to see
# failures early).
$line = "${indent}buildah_bud_test";
} }
} }
else { else {
undef $in_depend;
# FIXME THIS IS HORRIBLE! # FIXME THIS IS HORRIBLE!
# Add rootless jobs to the buildah bud test matrix. # Add rootless jobs to the buildah bud test matrix.
# This is incredibly fragile; it relies on the fact # This is incredibly fragile; it relies on the fact
@ -914,8 +902,10 @@ sub assert_buildah_vendor_commit {
my @deltas = git('diff', '--name-only', "$ref^", $ref); my @deltas = git('diff', '--name-only', "$ref^", $ref);
# It's OK if there are no deltas, e.g. immediately after a buildah vendor PR # It's OK if there are no deltas or if the only delta is to Cirrus.
return if !@deltas; # This is expected immediately after buildah gets vendored and
# there is nothing new to vendor in.
return if !@deltas || "@deltas" eq ".cirrus.yml";
# It's OK if there are more modified files than just these. # It's OK if there are more modified files than just these.
# It's not OK if any of these are missing. # It's not OK if any of these are missing.
@ -934,7 +924,7 @@ sub assert_buildah_vendor_commit {
return if !@missing; return if !@missing;
warn "$ME: $ref does not look like a buildah vendor commit:\n"; warn "$ME: $ref does not look like a buildah vendor commit:\n";
warn "$ME: - $_\n" for @missing; warn " - $_\n" for @missing;
die "$ME: Cannot continue\n"; die "$ME: Cannot continue\n";
} }