Skip to content

Add a new entrypoint for CI#34911

Merged
vieux merged 1 commit intomoby:masterfrom
dnephin:new-ci-entrypoint
Sep 26, 2017
Merged

Add a new entrypoint for CI#34911
vieux merged 1 commit intomoby:masterfrom
dnephin:new-ci-entrypoint

Conversation

@dnephin
Copy link
Copy Markdown
Member

@dnephin dnephin commented Sep 20, 2017

We've slowly been moving away from hack/make.sh as the in-container entrypoint for everything (#33987, #27964). This PR adds a new hack/ci directory which acts as the entrypoint for all the CI builds.

This setup has the following advantages:

  • allow us to support Create and send codecov report #34900 (uploading codecov) which we only want to run as part of CI
  • removes more configuration from jenkins (easier to maintain from the source repo)
  • allows us to run different tasks for each build (ex: we don't need cross on z/powerpc/arm)
  • should allow us to move more CI settings out of the Dockerfile (which is used for both CI and development) and into these entrypoint scripts, so we can provide better defaults for development
  • should allow us to being the windows CI inline with our linux CI (the entrypoint would be a powershell script at hack/ci/windows-RS1 instead of hundreds of lines in the jenkins config)

@dnephin
Copy link
Copy Markdown
Member Author

dnephin commented Sep 20, 2017

If the design looks ok I'll update Jenkins to check for the new scripts and run them instead of the old entrypoint.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
@dnephin
Copy link
Copy Markdown
Member Author

dnephin commented Sep 20, 2017

cc @seemethere @andrewhsu I think you use a different entrypoint for the integration suite, but just an FYI.

@seemethere
Copy link
Copy Markdown
Contributor

@dnephin We do use a different endpoint but this could be useful in the future. Would be opposed to changing the names of the architecture specific ones to their uname -m equivalents?

Example:

z -> s390x

@dnephin
Copy link
Copy Markdown
Member Author

dnephin commented Sep 20, 2017

I'd like them to match what shows up in github, so if we do that I think we need to change the github integration. I think that's a good idea, let's do that after this merges?

Copy link
Copy Markdown
Contributor

@seemethere seemethere left a comment

Choose a reason for hiding this comment

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

LGTM

@dnephin
Copy link
Copy Markdown
Member Author

dnephin commented Sep 21, 2017

build failures were just flaky test, re-running, but this is working

@dnephin
Copy link
Copy Markdown
Member Author

dnephin commented Sep 21, 2017

build is green!

Copy link
Copy Markdown
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐮

@tianon
Copy link
Copy Markdown
Member

tianon commented Sep 22, 2017

Seems sane to me 👍

We probably want to be careful to ensure Jenkins isn't running scripts directly outside a container (just for that extra bit of protection Docker can provide from malicious PRs), but it looks like that's the intended use of these scripts, so 👍. (just mentioning it for completeness)

Regarding naming, IMO we should adjust everything to match the OCI platform names (instead of uname -m), which match GOARCH too. 😇

@dnephin
Copy link
Copy Markdown
Member Author

dnephin commented Sep 26, 2017

all green here

@vieux vieux merged commit a971f9c into moby:master Sep 26, 2017
@vieux
Copy link
Copy Markdown
Contributor

vieux commented Sep 26, 2017

@seemethere @andrewhsu ping, you might need to update things on your side as well.

@dnephin dnephin deleted the new-ci-entrypoint branch September 26, 2017 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants