Merge pull request #26025 from Luap99/btrfs_noversion

Stop setting btrfs_noversion build tag

Author: openshift-merge-bot[bot]

Makefile

@@ -57,11 +57,10 @@ SYSTEMDDIR ?= ${LIBDIR}/systemd/system
 USERSYSTEMDDIR ?= ${LIBDIR}/systemd/user
 SYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/system-generators
 USERSYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/user-generators
-REMOTETAGS ?= remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp
+REMOTETAGS ?= remote exclude_graphdriver_btrfs containers_image_openpgp
 BUILDTAGS ?= \
 	$(shell hack/apparmor_tag.sh) \
 	$(shell hack/btrfs_installed_tag.sh) \
-	$(shell hack/btrfs_tag.sh) \
 	$(shell hack/systemd_tag.sh) \
 	$(shell hack/libsubid_tag.sh) \
 	$(if $(filter linux,$(GOOS)), seccomp,)

hack/btrfs_tag.sh

@@ -26,7 +26,7 @@ the same result:
 To focus on one specific test on windows, run `ginkgo` manually:
 
 ```pwsh
-$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp"
+$remotetags = "remote exclude_graphdriver_btrfs containers_image_openpgp"
 $focus_file = "basic_test.go"
 $focus_test = "podman build contexts"
 ./test/tools/build/ginkgo.exe `

pkg/machine/e2e/README.md

@@ -258,19 +258,19 @@ export BASEBUILDTAGS="$BASEBUILDTAGS libtrust_openssl"
 %endif
 
 # build %%{name}
-export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)"
+export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/libdm_tag.sh)"
 %gobuild -o bin/%{name} ./cmd/%{name}
 
 # build %%{name}-remote
-export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remote"
+export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs remote"
 %gobuild -o bin/%{name}-remote ./cmd/%{name}
 
 # build quadlet
-export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)"
+export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
 %gobuild -o bin/quadlet ./cmd/quadlet
 
 # build %%{name}-testing
-export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)"
+export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
 %gobuild -o bin/podman-testing ./cmd/podman-testing
 
 # reset LDFLAGS for plugins binaries

rpm/podman.spec

@@ -288,7 +288,7 @@ function Get-Podman-Version{
 # Init script
 $target = $args[0]
 
-$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp"
+$remotetags = "remote exclude_graphdriver_btrfs containers_image_openpgp"
 
 switch ($target) {
     {$_ -in '', 'podman-remote', 'podman'} {