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

CI: use different TMPDIR on prior-fedora

Browse Source 
A small number of tests are assuming that TMPDIR == /tmp. These
tests fail when that assumption does not hold.

Set TMPDIR=/var/tmp on prior-fedora, as a way to catch those.
/dev/shm would be a slightly better choice, because the
string "tmp" does not appear it in, but it's way too
small to be of any use: it fills up in the e2e prefetch.

This PR exposed a nasty bug in our Makefile: using "TMPDIR"
as temporary variable completely unrelated to (and inconsistent
with) the actual established use of TMPDIR. Solution: rename
that variable and make it lower case. Do the same with two
other ALL-CAP variables.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2023-07-18 17:14:46 -06:00
parent 85ab62042a
commit a92bb32196
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -123,6 +123,8 @@ build_task:
CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN} CTR_FQIN: ${PRIOR_FEDORA_CONTAINER_FQIN}
CI_DESIRED_RUNTIME: crun CI_DESIRED_RUNTIME: crun
CI_DESIRED_NETWORK: cni CI_DESIRED_NETWORK: cni
# Catch invalid "TMPDIR == /tmp" assumptions; PR #19281
TMPDIR: /var/tmp
- env: - env:
<<: *sqliteenvvars <<: *sqliteenvvars
DISTRO_NV: ${RAWHIDE_NAME} DISTRO_NV: ${RAWHIDE_NAME}

34
Makefile
View File

@ -721,11 +721,11 @@ podman-release: podman-release-$(GOARCH).tar.gz # Build all Linux binaries for
# calls along with careful manipulation of `$GOOS` and `$GOARCH`. # calls along with careful manipulation of `$GOOS` and `$GOARCH`.
podman-release-%.tar.gz: test/version/version podman-release-%.tar.gz: test/version/version
$(eval TMPDIR := $(shell mktemp -d podman_tmp_XXXX)) $(eval tmpsubdir := $(shell mktemp -d podman_tmp_XXXX))
$(eval SUBDIR := podman-v$(call err_if_empty,RELEASE_NUMBER)) $(eval releasedir := podman-v$(call err_if_empty,RELEASE_NUMBER))
$(eval _DSTARGS := "DESTDIR=$(TMPDIR)/$(SUBDIR)" "PREFIX=$(RELEASE_PREFIX)") $(eval _dstargs := "DESTDIR=$(tmpsubdir)/$(releasedir)" "PREFIX=$(RELEASE_PREFIX)")
$(eval GOARCH := $*) $(eval GOARCH := $*)
mkdir -p "$(call err_if_empty,TMPDIR)/$(SUBDIR)" mkdir -p "$(call err_if_empty,tmpsubdir)/$(releasedir)"
$(MAKE) GOOS=$(GOOS) GOARCH=$(NATIVE_GOARCH) \ $(MAKE) GOOS=$(GOOS) GOARCH=$(NATIVE_GOARCH) \
clean-binaries docs podman-remote-$(GOOS)-docs clean-binaries docs podman-remote-$(GOOS)-docs
if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then \ if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then \
@ -734,19 +734,19 @@ podman-release-%.tar.gz: test/version/version
else \ else \
$(MAKE) GOOS=$(GOOS) GOARCH=$(GOARCH) binaries; \ $(MAKE) GOOS=$(GOOS) GOARCH=$(GOARCH) binaries; \
fi fi
$(MAKE) $(_DSTARGS) install.bin install.remote install.man install.systemd $(MAKE) $(_dstargs) install.bin install.remote install.man install.systemd
tar -czvf $@ --xattrs -C "$(TMPDIR)" "./$(SUBDIR)" tar -czvf $@ --xattrs -C "$(tmpsubdir)" "./$(releasedir)"
if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi
-rm -rf "$(TMPDIR)" -rm -rf "$(tmpsubdir)"
podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$GOOS_$GOARCH, and docs. into an installation zip. podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$GOOS_$GOARCH, and docs. into an installation zip.
$(eval TMPDIR := $(shell mktemp -d podman_tmp_XXXX)) $(eval tmpsubdir := $(shell mktemp -d podman_tmp_XXXX))
$(eval SUBDIR := podman-$(call err_if_empty,RELEASE_NUMBER)) $(eval releasedir := podman-$(call err_if_empty,RELEASE_NUMBER))
$(eval _DSTARGS := "DESTDIR=$(TMPDIR)/$(SUBDIR)" "PREFIX=$(RELEASE_PREFIX)") $(eval _dstargs := "DESTDIR=$(tmpsubdir)/$(releasedir)" "PREFIX=$(RELEASE_PREFIX)")
$(eval GOOS := $(firstword $(subst _, ,$*))) $(eval GOOS := $(firstword $(subst _, ,$*)))
$(eval GOARCH := $(lastword $(subst _, ,$*))) $(eval GOARCH := $(lastword $(subst _, ,$*)))
$(eval _GOPLAT := GOOS=$(call err_if_empty,GOOS) GOARCH=$(call err_if_empty,GOARCH)) $(eval _GOPLAT := GOOS=$(call err_if_empty,GOOS) GOARCH=$(call err_if_empty,GOARCH))
mkdir -p "$(call err_if_empty,TMPDIR)/$(SUBDIR)" mkdir -p "$(call err_if_empty,tmpsubdir)/$(releasedir)"
$(MAKE) GOOS=$(GOOS) GOARCH=$(GOARCH) \ $(MAKE) GOOS=$(GOOS) GOARCH=$(GOARCH) \
clean-binaries podman-remote-$(GOOS)-docs clean-binaries podman-remote-$(GOOS)-docs
if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then \ if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then \
@ -761,13 +761,13 @@ podman-remote-release-%.zip: test/version/version ## Build podman-remote for %=$
if [[ "$(GOOS)" == "darwin" ]]; then \ if [[ "$(GOOS)" == "darwin" ]]; then \
$(MAKE) $(GOPLAT) podman-mac-helper;\ $(MAKE) $(GOPLAT) podman-mac-helper;\
fi fi
cp -r ./docs/build/remote/$(GOOS) "$(TMPDIR)/$(SUBDIR)/docs/" cp -r ./docs/build/remote/$(GOOS) "$(tmpsubdir)/$(releasedir)/docs/"
cp ./contrib/remote/containers.conf "$(TMPDIR)/$(SUBDIR)/" cp ./contrib/remote/containers.conf "$(tmpsubdir)/$(releasedir)/"
$(MAKE) $(GOPLAT) $(_DSTARGS) SELINUXOPT="" install.remote $(MAKE) $(GOPLAT) $(_dstargs) SELINUXOPT="" install.remote
cd "$(TMPDIR)" && \ cd "$(tmpsubdir)" && \
zip --recurse-paths "$(CURDIR)/$@" "./$(SUBDIR)" zip --recurse-paths "$(CURDIR)/$@" "./$(releasedir)"
if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi if [[ "$(GOARCH)" != "$(NATIVE_GOARCH)" ]]; then $(MAKE) clean-binaries; fi
-rm -rf "$(TMPDIR)" -rm -rf "$(tmpsubdir)"
# Checks out and builds win-sshproxy helper. See comment on GV_GITURL declaration # Checks out and builds win-sshproxy helper. See comment on GV_GITURL declaration
.PHONY: win-gvproxy .PHONY: win-gvproxy