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.

Sign up for GitHub

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

Jump to bottom

Move to CircleCI 2.0 #3333

Merged
merged 22 commits into from
Sep 1, 2018
Merged

Move to CircleCI 2.0 #3333

merged 22 commits into from
Sep 1, 2018

Conversation

bboreham
Copy link
Collaborator

@bboreham bboreham commented Aug 25, 2018 •
edited
Loading

Fixes #3217

Once the changes are merged to master I will update the image: lines to a master tag, the same tag for both images.

@bboreham bboreham force-pushed the circle-2.0 branch 5 times, most recently from 8a3b718 to c727710 Compare August 26, 2018 21:32
@bboreham
Copy link
Collaborator Author

@guyfedwards I took your starting-point, adapted it to multi-step in the same pattern as weaveworks/weave, then got it to build and pass tests.

I haven't tried the deployment step yet; it's set to run on master branch only.

@bboreham bboreham mentioned this pull request Aug 27, 2018
Closed
leth
leth reviewed Aug 28, 2018
View reviewed changes
.circleci/config.yml Outdated
# PATH must be set here as circle currently does not support string interpolation
# for environment
# https://discuss.circleci.com/t/bin-sh-mkdir-command-not-found/8710
- run: export PATH="$PATH:$HOME/.local/bin"

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

leth
leth reviewed Aug 28, 2018
View reviewed changes
.circleci/config.yml
steps:
- checkout
- run: GOARCH=arm make BUILD_IN_CONTAINER=false GO_BUILD_INSTALL_DEPS= prog/scope
- run: GOOS=darwin make BUILD_IN_CONTAINER=false GO_BUILD_INSTALL_DEPS= prog/scope

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

leth
leth reviewed Aug 28, 2018
View reviewed changes
.circleci/config.yml Outdated
client-defaults: &client-defaults
working_directory: /home/weave/scope
docker:
- image: weaveworks/scope-ui-build:circle-2.0-2885645

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

leth
leth reviewed Aug 28, 2018
View reviewed changes
.circleci/config.yml
<<: *defaults
steps:
- checkout
- run: make BUILD_IN_CONTAINER=false lint

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

leth
leth reviewed Aug 28, 2018
View reviewed changes
.circleci/config.yml

unit-test:
<<: *defaults
parallelism: 1

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

guyfedwards and others added 17 commits August 30, 2018 10:13
@guyfedwards @bboreham
initial
6b4a515
@guyfedwards @bboreham
fix env defaults
fc7e5bf
@guyfedwards @bboreham
add docker build image;
9efcea4
@bboreham
Don't need a third build image
191b6c8
@bboreham
Remove unnecessary file
89d7ab1
@bboreham
Tag build images with git hash
ec49a38
@bboreham
Break into steps, use current build images
c1b93c3
@bboreham
Sleep to stop TestRegistryDelete() failing
c07b6b5
@bboreham
Remove deploy-dev job; it isn't used
fd08129
@bboreham
Run arm and darwin builds after main build
d7b4084 
Try to balance the parallelism more
@bboreham
Don't insist the build container is up-to-date when BUILD_IN_CONTAINE…
ebfed1b 
…R=false

Why do you care?  You're either inside it or not using it.
@bboreham
Install docker client in build container
5d029d7
@bboreham
Run client static build
8b9d49d 
and run client lint and test in the same job, after client-build,
to reduce the number of jobs running in parallel.
@bboreham
Set up dependencies for integration test job
1d2a5c6 
* Build 'runner' program in build job and save to workspace;
* Save build outputs - externalui, staticui, codecgen output;
* Install required tools in test VM;
* Call 'make deps' in integration-tests-job and touch 'runner' from
  workspace so it doesn't rebuild.
@bboreham
'requests' is installed via pip; we don't need to install via apt-get…
e1552de 
… too
@bboreham
Move all go installs to same Dockerfile step
29e6409 
Reduces the size of the resulting image
@bboreham
Run coverage as part of integration test job
cf0d85b 
This lets it run at the same time as GCE VMs are deleted, and saves us
having to run up another job just for coverage.
@bboreham
Tidy up
6a51cd8
@bboreham
Use newer build image
8a0c422
@bboreham
Combine arm and darwin build jobs
7b9a15e 
saves spinning up another container
@bboreham
Get deploy step to work
1734def 
Simplify deploy shell scripts;
Run yarn bundle as part of client-build step;
Install awscli as part of deploy step;
Don't run ui-upload in another container.
@bboreham
Copy link
Collaborator Author

I tested the deploy step and addressed comments, so I think this is good to go now.

leth
leth approved these changes Aug 30, 2018
View reviewed changes
Copy link
Contributor

@leth leth left a comment

Choose a reason for hiding this comment

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

🏅

@bboreham
Copy link
Collaborator Author

Just realised I included the commit from #3334 in here to stop tests failing, so I won't merge this until #3334 is approved.

@bboreham bboreham merged commit fda40b8 into master Sep 1, 2018
@bboreham bboreham deleted the circle-2.0 branch September 1, 2018 12:48
@rade
Copy link
Member

rade commented Sep 1, 2018

Yeah!

@fbarl fbarl mentioned this pull request Sep 17, 2018
Closed
@leth leth mentioned this pull request Sep 26, 2018
Merged
@bboreham bboreham mentioned this pull request Sep 18, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leth leth leth approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bboreham @rade @leth @guyfedwards