Skip to content

Commit

Permalink
Merge branch 'main' into retry
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomSweeneyRedHat
TomSweeneyRedHat committed Feb 28, 2024
2 parents 7eb109e + b1ba39f commit 88750fe
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 18 deletions.
2 changes: 2 additions & 0 deletions .cirrus.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ in_podman_task:
# set of tasks all passed, and allows confirming that based on the status
# of this task.
success_task:

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Containerized Integration", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Containerized Integration", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Containerized Integration", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Containerized Integration", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Smoke Test", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Cross Compile", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Unit tests w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Build Conformance w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Containerized Integration", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ vfs", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-39 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration fedora-38 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Integration debian-13 w/ overlay", but their only_if conditions are different

Check warning on line 327 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L327 

task "Total Success" depends on task "Containerized Integration", but their only_if conditions are different
# N/B: The prow merge-bot (tide) is sensitized to this exact name, DO NOT CHANGE IT.
# Ref: https://github.com/openshift/release/pull/48909
name: "Total Success"
alias: success

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/stretchr/testify v1.8.4
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
go.etcd.io/bbolt v1.3.9
golang.org/x/crypto v0.19.0
golang.org/x/crypto v0.20.0
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
golang.org/x/sync v0.6.0
golang.org/x/sys v0.17.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,8 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg=
golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
Expand Down
3 changes: 3 additions & 0 deletions tests/helpers.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,9 @@ function skip_if_no_unshare() {
if ! unshare -U --map-users $(id -u),0,1 true ; then
skip "unshare does not support --map-users"
fi
if ! unshare -Ur --setuid 0 true ; then
skip "unshare does not support --setuid"
fi
}

function start_git_daemon() {
Expand Down
14 changes: 6 additions & 8 deletions vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions vendor/golang.org/x/crypto/ocsp/ocsp.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ go.opentelemetry.io/otel/metric/embedded
## explicit; go 1.20
go.opentelemetry.io/otel/trace
go.opentelemetry.io/otel/trace/embedded
# golang.org/x/crypto v0.19.0
# golang.org/x/crypto v0.20.0
## explicit; go 1.18
golang.org/x/crypto/argon2
golang.org/x/crypto/bcrypt
Expand Down

0 comments on commit 88750fe

Please sign in to comment.