require conmon v2.0.1 #3792

haircommander · 2019-08-12T15:02:44Z

Signed-off-by: Peter Hunt [email protected]

mheon · 2019-08-12T15:05:15Z

LGTM

TomSweeneyRedHat · 2019-08-12T16:38:15Z

Changes LGTM, but some tests aren't hip

rhatdan · 2019-08-12T17:03:03Z

libpod/runtime.go

+	// minConmonMajor is the major version required for conmon
+	minConmonMajor = 2
+	// minConmonVersion is a string used to display the minimum conmon version
+	minConmonVersion = "v2.0.0"


Can you make this
minConmonVersion = fmt.Sprintf("v%d.0.0", minConmonMajor)

Or better yet remove this variable and just use the minConmonMajor in the error message below.

rhatdan · 2019-08-12T17:34:04Z

libpod/runtime.go

@@ -829,7 +829,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) {

 	if !foundConmon {
 		if foundOutdatedConmon {
-			return errors.Wrapf(define.ErrConmonOutdated, "please update to v1.0.0 or later")
+			return errors.Wrapf(define.ErrConmonOutdated, "please update to v%s.0.0 or later", minConmonMajor)


Should be v%d.0.0

golang is so forgiving...

rhatdan · 2019-08-12T17:44:43Z

/lgtm
/hold
Feel free to hold cancel when tests pass.

mheon · 2019-08-15T16:48:31Z

Large quantities of test failures - does this need a rebase?

haircommander · 2019-08-15T16:59:57Z

@mheon let's try that :D

mheon · 2019-08-22T17:53:27Z

/approve

mheon · 2019-09-12T17:54:24Z

@haircommander Any chance we can get a rebase for the 1.6.0 release?

haircommander · 2019-09-12T18:00:08Z

@mheon sure, should we do 2.0.1 (the eventual new conmon)?

I'll need @lsm5 to integrate conmon into fedora before this could merge

mheon · 2019-09-12T18:18:02Z

If we can get 2.0.1 images, that'd be good - otherwise, ensuring 2.0.0 is probably sufficient.

lsm5 · 2019-09-12T19:04:18Z

@mheon sure, should we do 2.0.1 (the eventual new conmon)?

I'll need @lsm5 to integrate conmon into fedora before this could merge

done on rawhide already. I'll get it on the rest asap.

rhatdan · 2019-09-13T16:49:38Z

Conmon is now in place on F30 and f31.

mheon · 2019-10-28T18:00:19Z

/hold

mheon · 2019-10-28T18:00:30Z

Hung on a failed test

mheon · 2019-10-28T18:01:30Z

Restarted podman-in-podman but failures might be legitimate

haircommander · 2019-10-28T18:12:54Z

sorry folks, I think I missed the step of updating the dockerfile. ~~I think in_podman should pass now?~~

rhatdan · 2019-10-28T18:28:27Z

/lgtm
/hold
hold cancel when tests pass.

haircommander · 2019-10-28T19:42:23Z

@cevich am I correct in saying that this PR needs to be merged before the changes in the dockerfile get used in the in_podman task? If that were the case, this would need to be force merged when all other tests pass

Signed-off-by: Peter Hunt <[email protected]>

haircommander · 2019-10-29T14:04:16Z

manually pushed to the in_podman image. It should pass, then once we merge the post merge action will overwrite it organically. can I have a new lgtm @rhatdan @baude @vrothberg @TomSweeneyRedHat @mheon

haircommander · 2019-10-29T14:41:41Z

happy tests PTAL

TomSweeneyRedHat · 2019-10-29T14:59:27Z

Dockerfile

@@ -57,7 +57,7 @@ RUN set -x \
 	&& rm -rf "$GOPATH"

 # Install conmon
-ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
+ENV CONMON_COMMIT 65fe0226d85b69fc9e527e376795c9791199153d


This is fine for now, but consider changing this over to the tag for the release like 'v2.0.2' then below I think (didn't try it) you can do git checkout tags/CONMON_COMMIT, at least that's the theory.

I think actually the next step is to enable pulling conmon from a package (like the other vms do) instead of by git commit

TomSweeneyRedHat · 2019-10-29T15:00:05Z

LGTM

rhatdan · 2019-10-29T15:00:36Z

/lgtm

vrothberg · 2019-10-29T16:31:59Z

/hold cancel

vrothberg · 2019-10-29T16:32:43Z

Note that the code will slightly change as soon as I need to merge it into #4352

haircommander force-pushed the minimum-conmon branch from 7d39628 to c6898fd Compare August 12, 2019 15:47

openshift-ci-robot added the size/S label Aug 12, 2019

rhatdan reviewed Aug 12, 2019

View reviewed changes

haircommander force-pushed the minimum-conmon branch from c6898fd to 823c4b6 Compare August 12, 2019 17:28

rhatdan reviewed Aug 12, 2019

View reviewed changes

haircommander force-pushed the minimum-conmon branch from 823c4b6 to e43b6d5 Compare August 12, 2019 17:41

openshift-ci-robot assigned rhatdan Aug 12, 2019

openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Aug 12, 2019

haircommander mentioned this pull request Aug 12, 2019

Cirrus: Enable updates-testing repo for Fedora #3770

Merged

mheon added the Release Notes 1.5.2 label Aug 15, 2019

haircommander force-pushed the minimum-conmon branch from e43b6d5 to 9ccf681 Compare August 15, 2019 16:59

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 15, 2019

haircommander force-pushed the minimum-conmon branch from 9ccf681 to 9eba4c2 Compare August 21, 2019 17:56

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 22, 2019

haircommander force-pushed the minimum-conmon branch from 9eba4c2 to cd3936d Compare September 12, 2019 18:30

mheon removed the Release Notes 1.6.0 label Sep 13, 2019

haircommander force-pushed the minimum-conmon branch from cd3936d to 85a5bfc Compare September 18, 2019 15:23

openshift-ci-robot removed the size/S label Sep 18, 2019

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 28, 2019

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2019

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2019

haircommander added 4 commits October 28, 2019 16:13

require conmon v2.0.0

57fa6cf

Signed-off-by: Peter Hunt <[email protected]>

require conmon v2.0.1

306f7cb

Signed-off-by: Peter Hunt <[email protected]>

bump cirrus images

9ff6682

Signed-off-by: Peter Hunt <[email protected]>

update conmon to v2.0.2 in in_podman image

49e251f

Signed-off-by: Peter Hunt <[email protected]>

haircommander force-pushed the minimum-conmon branch from 97b2ca5 to 49e251f Compare October 28, 2019 20:21

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2019

TomSweeneyRedHat reviewed Oct 29, 2019

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 29, 2019

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 29, 2019

openshift-merge-robot merged commit 59582c5 into containers:master Oct 29, 2019

This was referenced Oct 29, 2019

refactor libpod config into libpod/config #4352

Merged

Cirrus: Support testing with F31 #3901

Merged

Log libseccomp package version #4340

Merged

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 26, 2023

github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

require conmon v2.0.1 #3792

require conmon v2.0.1 #3792

haircommander commented Aug 12, 2019 •

edited

Loading

mheon commented Aug 12, 2019

TomSweeneyRedHat commented Aug 12, 2019

rhatdan Aug 12, 2019

rhatdan Aug 12, 2019

haircommander Aug 12, 2019

rhatdan Aug 12, 2019

haircommander Aug 12, 2019

haircommander Aug 12, 2019

rhatdan commented Aug 12, 2019

mheon commented Aug 15, 2019

haircommander commented Aug 15, 2019

mheon commented Aug 22, 2019

mheon commented Sep 12, 2019

haircommander commented Sep 12, 2019

mheon commented Sep 12, 2019

lsm5 commented Sep 12, 2019

rhatdan commented Sep 13, 2019

mheon commented Oct 28, 2019

mheon commented Oct 28, 2019

mheon commented Oct 28, 2019

haircommander commented Oct 28, 2019 •

edited

Loading

rhatdan commented Oct 28, 2019

haircommander commented Oct 28, 2019

haircommander commented Oct 29, 2019

haircommander commented Oct 29, 2019

TomSweeneyRedHat Oct 29, 2019

haircommander Oct 29, 2019

TomSweeneyRedHat commented Oct 29, 2019

rhatdan commented Oct 29, 2019

vrothberg commented Oct 29, 2019

vrothberg commented Oct 29, 2019

require conmon v2.0.1 #3792

require conmon v2.0.1 #3792

Conversation

haircommander commented Aug 12, 2019 • edited Loading

mheon commented Aug 12, 2019

TomSweeneyRedHat commented Aug 12, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhatdan commented Aug 12, 2019

mheon commented Aug 15, 2019

haircommander commented Aug 15, 2019

mheon commented Aug 22, 2019

mheon commented Sep 12, 2019

haircommander commented Sep 12, 2019

mheon commented Sep 12, 2019

lsm5 commented Sep 12, 2019

rhatdan commented Sep 13, 2019

mheon commented Oct 28, 2019

mheon commented Oct 28, 2019

mheon commented Oct 28, 2019

haircommander commented Oct 28, 2019 • edited Loading

rhatdan commented Oct 28, 2019

haircommander commented Oct 28, 2019

haircommander commented Oct 29, 2019

haircommander commented Oct 29, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TomSweeneyRedHat commented Oct 29, 2019

rhatdan commented Oct 29, 2019

vrothberg commented Oct 29, 2019

vrothberg commented Oct 29, 2019

haircommander commented Aug 12, 2019 •

edited

Loading

haircommander commented Oct 28, 2019 •

edited

Loading