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

Feature/zenko 485 eve on s3 #1278

Merged
merged 2 commits into from
Jun 13, 2018
Merged

Feature/zenko 485 eve on s3 #1278

merged 2 commits into from
Jun 13, 2018

Conversation

ssalaues
Copy link

Adds basic Eve functionality using both kube and docker workers that can be the template for future additions.

2nd commit modifies the Dockerfile slightly to improve CI and local build time

@bert-e
Copy link
Contributor

bert-e commented Jun 12, 2018

Hello ssalaues,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get
information on this process.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jun 12, 2018

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • 2 peers

tmacro
tmacro previously approved these changes Jun 12, 2018
View reviewed changes
Copy link
Contributor

@tmacro tmacro left a comment

Choose a reason for hiding this comment

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

LGTM

@ssalaues ssalaues force-pushed the feature/ZENKO-485-eve-on-s3 branch from 5212df1 to bca4bef Compare June 12, 2018 23:02
@ironman-machine ironman-machine dismissed tmacro’s stale review June 12, 2018 23:02

Do it again human slave!:point_right: :runner: (Oh and the pull request has been updated, by the way.)

@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@ssalaues ssalaues force-pushed the feature/ZENKO-485-eve-on-s3 branch from bca4bef to ed90015 Compare June 12, 2018 23:07
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@ssalaues
Copy link
Author

Fixed commit messages

@ssalaues ssalaues force-pushed the feature/ZENKO-485-eve-on-s3 branch from ed90015 to 3d29160 Compare June 12, 2018 23:25
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@ssalaues
Copy link
Author

Fixed post merge step

@ssalaues
Copy link
Author

example of the post-merge docker build step
https://eve.devsca.com/github/scality/s3/#/builders/3/builds/2566

rahulreddy
rahulreddy previously approved these changes Jun 12, 2018
View reviewed changes
Copy link
Collaborator

@rahulreddy rahulreddy left a comment

Choose a reason for hiding this comment

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

Quick review. LGTM in general.

eve/main.yml
- '/home/eve/workspace'
steps:
- Git: *clone
- ShellCommand: *npm-install
Copy link
Collaborator

Choose a reason for hiding this comment

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

Shall we use yarn? It's faster.

Copy link
Author

Choose a reason for hiding this comment

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

I'll try it out. Should work

eve/workers/build/Dockerfile Outdated
COPY ./s3_packages.list ./buildbot_worker_packages.list /tmp/
RUN apt-get update \
&& cat /tmp/*packages.list | xargs apt-get install -y \
&& wget https://nodejs.org/dist/v6.9.5/node-v6.9.5-linux-x64.tar.xz \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we try using n to manage node.js distribution? This way we can automatically install n 6.x and get the latest minor-minor version.
https://github.com/tj/n

Copy link
Author

Choose a reason for hiding this comment

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

Yeah that's a good idea. I'll add that in.

@rahulreddy
Copy link
Collaborator

@bert-e wait

alexanderchan-scality
alexanderchan-scality previously approved these changes Jun 13, 2018
View reviewed changes
Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Giorgio Regni <gr@scality.com>
WORKDIR /usr/src/app

# Keep the .git directory in order to properly report version
COPY . /usr/src/app
COPY ./package.json .
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks good. just curious as to why only the package.json is copied here rather than the whole dir

Copy link
Author

@ssalaues ssalaues Jun 13, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

So this is where the magic of docker layers becomes useful. So say you are changing code and need to rebuild your docker image to test but you dependencies stay the same. If this was built previously, then on consecutive runs Docker will skip this step along with the following RUN step where all the system packages and npm packages are installed and use the cached layers from the previous builds.

It then will use the step at line 18 to copy the remaining code base into the image which wont be cached because of code changes.

@ssalaues ssalaues force-pushed the feature/ZENKO-485-eve-on-s3 branch from 3d29160 to 211b4b7 Compare June 13, 2018 18:55
@ironman-machine ironman-machine dismissed stale reviews from rahulreddy and alexanderchan-scality June 13, 2018 18:55

Do it again human slave!:point_right: :runner: (Oh and the pull request has been updated, by the way.)

@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@ironman-machine
Copy link
Contributor 

CONFLICT (add/add): Merge conflict in wait_for_local_port.bash

@ssalaues ssalaues force-pushed the feature/ZENKO-485-eve-on-s3 branch from 211b4b7 to 728f1b4 Compare June 13, 2018 20:22
@ironman-machine ironman-machine dismissed jonathan-gramain’s stale review June 13, 2018 20:22

Do it again human slave!:point_right: :runner: (Oh and the pull request has been updated, by the way.)

@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

Salim added 2 commits June 13, 2018 13:33
feature: ZENKO-482 Eve CI
6407011 
This integrates the mongo ft_tests suite into the Eve CI using
kube workers that can be the template for future workers and porting
the remaining tests over.
feature: Speed up Docker rebuild using cache
387cac9 
Allows faster CI and dev builds of the Docker image through the use
of cached layers.
@ssalaues ssalaues force-pushed the feature/ZENKO-485-eve-on-s3 branch from 728f1b4 to 387cac9 Compare June 13, 2018 20:33
@ironman-machine
Copy link
Contributor

PR has been updated. Reviewers, please be cautious.

@rahulreddy rahulreddy merged commit a894377 into development/8.0 Jun 13, 2018
@rahulreddy
Copy link
Collaborator

Merging manually due to a know Azure issue in CI.

@rahulreddy rahulreddy deleted the feature/ZENKO-485-eve-on-s3 branch June 13, 2018 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rahulreddy rahulreddy rahulreddy approved these changes

@jonathan-gramain jonathan-gramain jonathan-gramain left review comments

@alexanderchan-scality alexanderchan-scality alexanderchan-scality left review comments

@tmacro tmacro tmacro left review comments

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

Successfully merging this pull request may close these issues.
7 participants
@ssalaues @bert-e @ironman-machine @rahulreddy @jonathan-gramain @alexanderchan-scality @tmacro