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

Test multiple versions of k8s #291

Merged
merged 10 commits into from
Jun 25, 2019
Merged

Test multiple versions of k8s #291

merged 10 commits into from
Jun 25, 2019

Conversation

foot
Copy link
Contributor

@foot foot commented Jun 24, 2019

  • First go, use even more yaml anchor helpers

Fixes #288

@foot foot requested a review from dlespiau June 25, 2019 08:23
Copy link
Contributor

@dlespiau dlespiau left a comment

Choose a reason for hiding this comment

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

19 checks successful! 😱

looks great to me ⭐ :)

I've been toying with the idea of generating travis/circle CI files from js/ts and jk to go beyond anchors, but it seems anchors can be made quite readable :)

@foot
Copy link
Contributor Author

foot commented Jun 25, 2019

I've been toying with the idea of generating travis/circle CI files from js/ts and jk to go beyond anchors, but it seems anchors can be made quite readable :)

Yes! That was plan B when anchors obviously failed, but they worked okay in the end.

@foot foot merged commit baf30e1 into master Jun 25, 2019
@foot foot deleted the 288-update-integration-tests-to branch June 25, 2019 10:08
@rade
Copy link
Member

rade commented Jun 25, 2019

This is awesome!

Two niggles

  • missing trailing newline
  • it would have been good to squash some of the commits, to elide missteps

@foot
Copy link
Contributor Author

foot commented Jun 25, 2019

missing trailing newline

Will fix

it would have been good to squash some of the commits, to elide missteps

I tested out the "squash and merge" feature of GitHub for the first time which has made a history that looks like this now:

* baf30e1 (HEAD -> master, origin/master, origin/HEAD) Test multiple versions of k8s (#291)
| * 50102a4 (origin/288-update-integration-tests-to, 288-update-integration-tests-to) Re-run kubernetes jobs once a day in case of new k8s
| * 7c6f178 Getting bash syntax in order
| * ca03827 Add a third "stable" target for k8s testing
| * 5e9a2d7 Factor out some more things
| * c54a33b even edgeier?
| * f57578b no dice, newer machine image
| * 122583d Internet suggested hack to get minikube+circleci
| * 6c545c0 Test earlier minikube
| * 0f2c5f6 Ooops, wrong syntax, disable some jobs for now
| * 81439ba Test multiple versions of k8s
|/
*   e51f65d Merge pull request #289 from weaveworks/fixes-minikube-dns-failures

E.g. It created a new squashed commit on master rather than a merge commit. I'll avoid that in the future as its a bit confusing.

@rade
Copy link
Member

rade commented Jun 25, 2019

I would stay away from "squash and merge" and be more selective. Squashing all commits into one is rarely the right level of granularity.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update integration tests to consider new / multiple version of k8s
3 participants