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

modules/bootkube/resources/bootkube: Restore --tmpfs #253

Merged
merged 2 commits into from
Sep 15, 2018

Conversation

wking
Copy link
Member

@wking wking commented Sep 14, 2018

We'd removed this in c234fc3 (#207) to work around this and this. Now that RHCOS is up to:

$ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/latest/pkglist.txt | grep runc
 runc-1.0.0-52.dev.git70ca035.el7_5.x86_64

we can restore the option.

/hold

We'll probably need to bump our AMI too...

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 14, 2018
@wking wking force-pushed the restore-tmpdir branch 2 times, most recently from a172263 to c07eec9 Compare September 14, 2018 21:00
Details on this build:

  $ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/aws-us-east-1-tested.json | jq -S
  {
    "HVM": "ami-0af8953af3ec06b7c",
    "S3Object": "s3://openshift-qe-images/rhcos/cloud/rhcos-4.0.5595-aws.vmdk",
    "SnapshotID": "snap-07b2295a6b24ebf60"
  }
  $ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/4.0.5595-1/meta.json | jq -S
  {
    "git-commit": "3863c9670d95ed950e5f68ca5e93947dfd214ef1",
    "image-genver": "1",
    "image-version": "4.0.5595-1",
    "ostree-commit": "622abd584071ebd426ff33b3d5b17cf08e16eff7d7fd2a9d97ace8ad24e3cedc",
    "ostree-version": "4.0.5595"
  }
  $ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/4.0.5595-1/pkglist.txt | grep 'docker\|runc'
   docker-2:1.13.1-75.git8633870.el7_5.x86_64
   docker-client-2:1.13.1-75.git8633870.el7_5.x86_64
   docker-common-2:1.13.1-75.git8633870.el7_5.x86_64
   docker-lvm-plugin-2:1.13.1-75.git8633870.el7_5.x86_64
   docker-novolume-plugin-2:1.13.1-75.git8633870.el7_5.x86_64
   docker-rhel-push-plugin-2:1.13.1-75.git8633870.el7_5.x86_64
   runc-1.0.0-52.dev.git70ca035.el7_5.x86_64

After a brief window without either Docker or a working CRI-O, we've
got a new RHCOS with Docker back on.  Let's use it.  This bump should
also pull in runc-1.0.0-52.dev.git70ca035.el7_5.x86_64 needed by the
next commit.

Generated with:

  $ sed -i s/ami-07307c397daf4d02e/ami-0af8953af3ec06b7c/g $(git grep -l ami-07307c397daf4d02e)
We'd removed this in c234fc3 (*: use podman instead of docker,
2018-09-05, openshift#207) to work around [1,2].  Now that RHCOS is up to:

  $ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/latest/pkglist.txt | grep runc
   runc-1.0.0-52.dev.git70ca035.el7_5.x86_64

we can restore the option.

[1]: openshift/os#284
[2]: containers/podman#1396
@wking
Copy link
Member Author

wking commented Sep 14, 2018

/hold cancel

This AMI should be good to go as far as Docker and runc are concerned. There's still an outstanding CRI-O bug in:

$ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/4.0.5595-1/pkglist.txt | grep 'cri-o'
 cri-o-1.11.2-1.git3eac3b2.el7.x86_64

The next image in the pipe has a bumped version:

$ curl -s http://aos-ostree.rhev-ci-vms.eng.rdu2.redhat.com/rhcos/images/cloud/4.0.5597-1/pkglist.txt | grep 'cri-o'
 cri-o-1.11.3-2.rhaos3.11.git4fbb022.el7_5.x86_64

But cri-o/cri-o#1796 is for 1.11.3-2, so we're still not out of the woods if we need this for #251 or similar.

@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 Sep 14, 2018
@crawford
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 14, 2018
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, wking

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

@wking
Copy link
Member Author

wking commented Sep 14, 2018

The e2e-aws error was:

Failure [591.613 seconds]
[BeforeSuite] BeforeSuite 
/tmp/openshift/build-rpms/rpm/BUILD/origin-4.0.0/_output/local/go/src/github.com/openshift/origin/vendor/k8s.io/kubernetes/test/e2e/e2e.go:140

  Node 1 disappeared before completing BeforeSuite

  /tmp/openshift/build-rpms/rpm/BUILD/origin-4.0.0/_output/local/go/src/github.com/openshift/origin/vendor/k8s.io/kubernetes/test/e2e/e2e.go:140

@eparis just got the same thing over here. Did #119 break something here?

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@abhinavdahiya
Copy link
Contributor

@wking did you rebase after #251 ?

@wking
Copy link
Member Author

wking commented Sep 15, 2018

did you rebase after #251 ?

No. Do I need to?

@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Sep 15, 2018

That helped #206 ; if this runs fails maybe then..

@abhinavdahiya
Copy link
Contributor

But it looks like CI is progressing correctly without it.

2018/09/15 01:45:27 Running pod e2e-aws
2018/09/15 02:00:30 Container setup in pod e2e-aws completed successfully
2018/09/15 02:01:12 Container test in pod e2e-aws completed successfully

@openshift-merge-robot openshift-merge-robot merged commit a6f7f67 into openshift:master Sep 15, 2018
@wking
Copy link
Member Author

wking commented Sep 15, 2018

But it looks like CI is progressing correctly without it.

Yeah, I think test run after merging into master.

@wking wking deleted the restore-tmpdir branch September 15, 2018 02:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants