DO NOT MERGE: vendor in buildah @ v1.38.1-0.20241122025341-998312277d88

This is a JUNK COMMIT from buildah-vendor-treadmill-x v0.3. DO NOT MERGE! This is just a way to keep the buildah-podman vendoring in sync. Refer to: https://github.com/containers/podman/wiki/Buildah-Vendor-Treadmill Signed-off-by: Ed Santiago <[email protected]>
containers · Nov 22, 2024 · 024418a · 024418a
1 parent 44601fd
commit 024418a
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 28 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -413,7 +413,8 @@ bindings_task:
 swagger_task:
     name: "Test Swagger"
     alias: swagger
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     gce_instance: *standardvm
     env:
         <<: *stdenvars
@@ -441,7 +442,8 @@ win_installer_task:
             CONTAINERS_MACHINE_PROVIDER: 'hyperv'
     alias: win_installer
     only_if: *no_rhel_release
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     ec2_instance: &windows
         image: "${WINDOWS_AMI}"
         type: m5.large
@@ -509,7 +511,8 @@ docker-py_test_task:
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('test/python/**') ||
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     gce_instance: *standardvm
     env:
         <<: *stdenvars
@@ -536,7 +539,8 @@ unit_test_task:
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('**/*_test.go') ||
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     matrix:
         - env: *stdenvars
         # Special-case: Rootless on latest Fedora (standard) VM
@@ -566,7 +570,8 @@ apiv2_test_task:
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('test/apiv2/**', 'test/python/**') ||
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     gce_instance: *standardvm
     env:
         <<: *stdenvars
@@ -595,7 +600,8 @@ compose_test_task:
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('test/compose/**') ||
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     gce_instance: *standardvm
     matrix:
       - env:
@@ -627,7 +633,8 @@ local_integration_test_task: &local_integration_test_task
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('test/e2e/**', 'test/utils/**') ||
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     matrix: *platform_axis
     # integration tests scale well with cpu as they are parallelized
     # so we give these tests 4 cores to make them faster
@@ -662,7 +669,8 @@ container_integration_test_task:
     alias: container_integration_test
     # Docs: ./contrib/cirrus/CIModes.md
     only_if: *only_if_int_test
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     matrix: &fedora_vm_axis
         - env:
               DISTRO_NV: ${FEDORA_NAME}
@@ -689,7 +697,8 @@ rootless_integration_test_task:
     alias: rootless_integration_test
     # Docs: ./contrib/cirrus/CIModes.md
     only_if: *only_if_int_test
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     matrix: *platform_axis
     gce_instance: *fastvm
     env:
@@ -712,7 +721,8 @@ podman_machine_task:
         $CIRRUS_CHANGE_TITLE =~ '.*CI:ALL.*' ||
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('cmd/podman/machine/**', 'pkg/machine/**', '**/*machine*.go')
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     ec2_instance:
         image: "${VM_IMAGE_NAME}"
         type: "${EC2_INST_TYPE}"
@@ -734,7 +744,8 @@ podman_machine_aarch64_task:
     name: *std_name_fmt
     alias: podman_machine_aarch64
     only_if: *only_if_machine_test
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     ec2_instance:
         <<: *standard_build_ec2_aarch64
     timeout_in: 30m
@@ -767,7 +778,8 @@ podman_machine_windows_task:
     skip: &skip_rhel_release |
         $CIRRUS_BRANCH =~ 'v[0-9\.]+-rhel' ||
         $CIRRUS_BASE_BRANCH =~ 'v[0-9\.]+-rhel'
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     ec2_instance:
         <<: *windows
         type: m5zn.metal
@@ -793,7 +805,8 @@ podman_machine_mac_task:
     alias: podman_machine_mac
     only_if: *only_if_machine_test
     skip: *skip_rhel_release
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     persistent_worker: *mac_pw
     timeout_in: 35m
     env:
@@ -849,7 +862,8 @@ local_system_test_task: &local_system_test_task
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('test/system/**') ||
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     matrix: *platform_axis
     gce_instance: *fastvm
     timeout_in: 25m
@@ -866,7 +880,8 @@ local_system_test_aarch64_task: &local_system_test_task_aarch64
     alias: local_system_test_aarch64
     # Docs: ./contrib/cirrus/CIModes.md
     only_if: *only_if_system_test
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     ec2_instance: *standard_build_ec2_aarch64
     timeout_in: 35m
     env:
@@ -918,7 +933,8 @@ rootless_system_test_task:
     alias: rootless_system_test
     # Docs: ./contrib/cirrus/CIModes.md
     only_if: *only_if_system_test
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     matrix: *platform_axis
     gce_instance: *fastvm
     timeout_in: 25m
@@ -944,7 +960,8 @@ farm_test_task:
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('test/farm/**', 'test/system/*.bash') ||
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     gce_instance: *standardvm
     env:
         <<: *stdenvars
@@ -976,6 +993,12 @@ buildah_bud_test_task:
             PODBIN_NAME: podman
         - env:
             PODBIN_NAME: remote
+        - env:
+            PODBIN_NAME: podman
+            PRIV_NAME: rootless
+        - env:
+            PODBIN_NAME: remote
+            PRIV_NAME: rootless
     gce_instance: *standardvm
     timeout_in: 45m
     clone_script: *get_gosrc
@@ -996,7 +1019,8 @@ upgrade_test_task:
         changesInclude('.cirrus.yml', 'Makefile', 'contrib/cirrus/**', 'vendor/**', 'test/tools/**', 'test/registries*.conf', 'hack/**', 'version/rawversion/*') ||
         changesInclude('test/upgrade/**', 'test/system/*.bash') ||
         (changesInclude('**/*.go', '**/*.c', '**/*.h') && !changesIncludeOnly('test/**', 'pkg/machine/e2e/**'))
-    depends_on: *build
+    depends_on:
+      - buildah_bud_test
     matrix:
         - env:
               # 2024-02: as long as possible/reasonable, try to keep

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/checkpoint-restore/checkpointctl v1.3.0
 	github.com/checkpoint-restore/go-criu/v7 v7.2.0
 	github.com/containernetworking/plugins v1.5.1
-	github.com/containers/buildah v1.38.1-0.20241115143500-f1543bdd7d37
+	github.com/containers/buildah v1.38.1-0.20241122025341-998312277d88
 	github.com/containers/common v0.61.1-0.20241112152446-305e9ce69b0f
 	github.com/containers/conmon v2.0.20+incompatible
 	github.com/containers/gvisor-tap-vsock v0.8.0

diff --git a/go.sum b/go.sum
@@ -79,8 +79,8 @@ github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8F
 github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
 github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+E5J/EcKOE4gQ=
 github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM=
-github.com/containers/buildah v1.38.1-0.20241115143500-f1543bdd7d37 h1:dcafNYeXF36G5/3bBR7XZtR+2IiKaHl8IWeKIbuQpY4=
-github.com/containers/buildah v1.38.1-0.20241115143500-f1543bdd7d37/go.mod h1:bjeQEXG0EDiLEkUmi4m7ihv6Ic1BugUF/wUfIcKBcU0=
+github.com/containers/buildah v1.38.1-0.20241122025341-998312277d88 h1:Xa1sfUgLrIuXx5q3JtyQmg/6suD/lWu0PqcdGFQFrSU=
+github.com/containers/buildah v1.38.1-0.20241122025341-998312277d88/go.mod h1:RxIuKhwTpRl3ma4d4BF6QzSSeg9zNNvo/xhYJOKeDQs=
 github.com/containers/common v0.61.1-0.20241112152446-305e9ce69b0f h1:K3jmJrkDJJhLnRdVFI7Gb5mv4/jb2ue9StZ2F1y2rsE=
 github.com/containers/common v0.61.1-0.20241112152446-305e9ce69b0f/go.mod h1:NGRISq2vTFPSbhNqj6MLwyes4tWSlCnqbJg7R77B8xc=
 github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=

diff --git a/vendor/github.com/containers/buildah/Makefile b/vendor/github.com/containers/buildah/Makefile
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -143,7 +143,7 @@ github.com/containernetworking/cni/pkg/version
 # github.com/containernetworking/plugins v1.5.1
 ## explicit; go 1.20
 github.com/containernetworking/plugins/pkg/ns
-# github.com/containers/buildah v1.38.1-0.20241115143500-f1543bdd7d37
+# github.com/containers/buildah v1.38.1-0.20241122025341-998312277d88
 ## explicit; go 1.22.6
 github.com/containers/buildah
 github.com/containers/buildah/bind