Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More /var/run -> /run #8953

Merged
merged 1 commit into from
Jan 12, 2021

Conversation

edsantiago
Copy link
Member

PR #8851 broke CI: it included "/var/run" strings that,
per #8771, should have been just "/run".

Signed-off-by: Ed Santiago [email protected]

PR containers#8851 broke CI: it included "/var/run" strings that,
per containers#8771, should have been just "/run".

Signed-off-by: Ed Santiago <[email protected]>
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edsantiago

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2021
@edsantiago
Copy link
Member Author

@Luap99 PTAL

@mheon
Copy link
Member

mheon commented Jan 12, 2021

LGTM

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@edsantiago
Copy link
Member Author

For posterity, the failure is:

=== RUN   TestCreatePodSystemdUnit/pod_with_root_args
    pods_test.go:246: 
        	Error Trace:	pods_test.go:246
        	Error:      	Not equal: 
        	            	expected: "# pod-123abc.service\n# autogenerated by Podman CI\n\n[Unit]\nDescription=Podman pod-123abc.service\nDocumentation=man:podman-generate-systemd(1)\nWants=network.target\nAfter=network-online.target\nRequires=container-1.service container-2.service\nBefore=container-1.service container-2.service\n\n[Service]\nEnvironment=PODMAN_SYSTEMD_UNIT=%n\nRestart=always\nTimeoutStopSec=102\nExecStart=/usr/bin/podman start jadda-jadda-infra\nExecStop=/usr/bin/podman stop -t 42 jadda-jadda-infra\nExecStopPost=/usr/bin/podman stop -t 42 jadda-jadda-infra\nPIDFile=/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid\nType=forking\n\n[Install]\nWantedBy=multi-user.target default.target\n"
        	            	actual  : "# pod-123abc.service\n# autogenerated by Podman CI\n\n[Unit]\nDescription=Podman pod-123abc.service\nDocumentation=man:podman-generate-systemd(1)\nWants=network.target\nAfter=network-online.target\nRequires=container-1.service container-2.service\nBefore=container-1.service container-2.service\n\n[Service]\nEnvironment=PODMAN_SYSTEMD_UNIT=%n\nRestart=always\nTimeoutStopSec=102\nExecStart=/usr/bin/podman start jadda-jadda-infra\nExecStop=/usr/bin/podman stop -t 42 jadda-jadda-infra\nExecStopPost=/usr/bin/podman stop -t 42 jadda-jadda-infra\nPIDFile=/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid\nType=forking\n\n[Install]\nWantedBy=multi-user.target default.target\n"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -18,3 +18,3 @@
        	            	 ExecStopPost=/usr/bin/podman stop -t 42 jadda-jadda-infra
        	            	-PIDFile=/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid
        	            	+PIDFile=/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid
        	            	 Type=forking
        	Test:       	TestCreatePodSystemdUnit/pod_with_root_args

Reference: log (Source: #8951)

@mheon
Copy link
Member

mheon commented Jan 12, 2021

/lgtm
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 12, 2021
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2021
@mheon
Copy link
Member

mheon commented Jan 12, 2021

Tests are failing with 503s on registry.redhat.com

@edsantiago
Copy link
Member Author

Yeah, we had a ton of failures earlier, like 8 or so. I restarted them all, looks like some of them passed. I just restarted the new crop. I hate flakes.

@edsantiago
Copy link
Member Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 12, 2021
@openshift-merge-robot openshift-merge-robot merged commit f52a9ee into containers:master Jan 12, 2021
@edsantiago edsantiago deleted the var_run_again branch January 13, 2021 00:21
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants