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

[rhcos-4.2] mantle: bump to 3de96c529ab474fcb72244ddd3041a942043e9ff #713

Merged
merged 1 commit into from Aug 14, 2019

Conversation

@miabbott
Copy link
Collaborator

commented Aug 14, 2019

We want the new blacklist support, but get all this stuff, too.

$ git shortlog --no-merges 33256a37f15f05bb0c8b9680ddeda941c0f56155..3de96c529ab474fcb72244ddd3041a942043e9ff
Andrew Jeddeloh (1):
      vendor: bump ignition to v2.0.1

Colin Walters (1):
      ore: Make upload --force deregister AMI, delete snapshot too

Jonathan Lebon (5):
      kola: skip tests incompatible with FCOS
      platform/api/aws: split out UploadObjectExt function
      plume: include release metadata URL in error message
      platform/api/aws: add max_age for S3 uploads
      plume: upload release index with max-age=300

Michael Nguyen (4):
      plume: handle non-existent fcos releases.json
      kola/packages: add no python test for fcos
      platform: add distribution to cluster interface
      kola/tests/rpmostree: handle install path for fcos

Stephen Lowrie (2):
      plume: FCOS: modify launch-permissions for AMIs
      platform/api/aws/images: return snapshotID from CopyImage

Steve Milner (1):
      kola: Add --blacklist-test switch
mantle: bump to 3de96c529ab474fcb72244ddd3041a942043e9ff
We want the new blacklist support, but get all this stuff, too.

```
$ git shortlog --no-merges 33256a37f15f05bb0c8b9680ddeda941c0f56155..3de96c529ab474fcb72244ddd3041a942043e9ff
Andrew Jeddeloh (1):
      vendor: bump ignition to v2.0.1

Colin Walters (1):
      ore: Make upload --force deregister AMI, delete snapshot too

Jonathan Lebon (5):
      kola: skip tests incompatible with FCOS
      platform/api/aws: split out UploadObjectExt function
      plume: include release metadata URL in error message
      platform/api/aws: add max_age for S3 uploads
      plume: upload release index with max-age=300

Michael Nguyen (4):
      plume: handle non-existent fcos releases.json
      kola/packages: add no python test for fcos
      platform: add distribution to cluster interface
      kola/tests/rpmostree: handle install path for fcos

Stephen Lowrie (2):
      plume: FCOS: modify launch-permissions for AMIs
      platform/api/aws/images: return snapshotID from CopyImage

Steve Milner (1):
      kola: Add --blacklist-test switch
```

@miabbott miabbott changed the title mantle: bump to 3de96c529ab474fcb72244ddd3041a942043e9ff [rhcos-4.2] mantle: bump to 3de96c529ab474fcb72244ddd3041a942043e9ff Aug 14, 2019

@ashcrow ashcrow merged commit 16d0eba into coreos:rhcos-4.2 Aug 14, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jlebon

This comment has been minimized.

Copy link
Member

commented Aug 14, 2019

LGTM, just a nit about procedure: I think we should always bump mantle in master first. Then syncing to rhcos-* is just another backport. (And hopefully we never have to start pushing rhcos-* branches on mantle too). Adding another type of drift on top is just gonna make things more challenging :). We also have CI hooked up to master which will sanity check the bump against FCOS.

@miabbott

This comment has been minimized.

Copy link
Collaborator Author

commented Aug 16, 2019

LGTM, just a nit about procedure: I think we should always bump mantle in master first. Then syncing to rhcos-* is just another backport. (And hopefully we never have to start pushing rhcos-* branches on mantle too). Adding another type of drift on top is just gonna make things more challenging :). We also have CI hooked up to master which will sanity check the bump against FCOS.

Agreed. I'm not sure why I decided to make this change in the branch first, but will bump on master first in the future.

miabbott added a commit to miabbott/coreos-assembler that referenced this pull request Aug 16, 2019

mantle: bump to 3de96c52
I bumped mantle to `3de96c52` on `rhcos-4.2` in coreos#713, but should have
done it here in `master` first.  Just tying up that loose end...

```
git shortlog --no-merges e32f42fe563f6e0e44e2fcb73ea574dabe4f0428..3de96c529ab474fcb72244ddd3041a942043e9ff)
Michael Nguyen (2):
      platform: add distribution to cluster interface
      kola/tests/rpmostree: handle install path for fcos

Steve Milner (1):
      kola: Add --blacklist-test switch
```
@miabbott miabbott referenced this pull request Aug 16, 2019

jlebon added a commit that referenced this pull request Aug 16, 2019

mantle: bump to 3de96c52
I bumped mantle to `3de96c52` on `rhcos-4.2` in #713, but should have
done it here in `master` first.  Just tying up that loose end...

```
git shortlog --no-merges e32f42fe563f6e0e44e2fcb73ea574dabe4f0428..3de96c529ab474fcb72244ddd3041a942043e9ff)
Michael Nguyen (2):
      platform: add distribution to cluster interface
      kola/tests/rpmostree: handle install path for fcos

Steve Milner (1):
      kola: Add --blacklist-test switch
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.