-
Notifications
You must be signed in to change notification settings - Fork 160
[master] Remove image-based build (for docker engine activate) #411
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,4 +5,3 @@ tmp | |
| artifacts | ||
| sources | ||
| *.tar | ||
| image-linux* | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,56 @@ | ||
| #!groovy | ||
|
|
||
|
|
||
| def genBranch(String arch) { | ||
| return [ | ||
| "${arch}": { -> | ||
| stage("Build engine image on ${arch}") { | ||
| wrappedNode(label: "linux&&${arch}", cleanWorkspace: true) { | ||
| try { | ||
| checkout scm | ||
| sh("git clone https://github.com/docker/engine.git engine") | ||
| sh('make ENGINE_DIR=$(pwd)/engine image') | ||
| } finally { | ||
| sh('make ENGINE_DIR=$(pwd)/engine clean-image clean-engine') | ||
| } | ||
| } | ||
| } | ||
| }] | ||
| } | ||
|
|
||
| def branch = env.CHANGE_TARGET ?: env.BRANCH_NAME | ||
|
|
||
| test_steps = [ | ||
| 'deb': { -> | ||
| stage('Ubuntu Xenial Debian Package') { | ||
| wrappedNode(label: 'ubuntu && x86_64', cleanWorkspace: true) { | ||
| checkout scm | ||
| sh('git clone https://github.com/docker/cli.git') | ||
| sh("git -C cli checkout $branch") | ||
| sh('git clone https://github.com/docker/engine.git') | ||
| sh("git -C engine checkout $branch") | ||
| sh('make -C deb VERSION=0.0.1-dev ENGINE_DIR=$(pwd)/engine CLI_DIR=$(pwd)/cli ubuntu-xenial') | ||
| try { | ||
| checkout scm | ||
| sh('git clone https://github.com/docker/cli.git') | ||
| sh("git -C cli checkout $branch") | ||
| sh('git clone https://github.com/docker/engine.git') | ||
| sh("git -C engine checkout $branch") | ||
| sh('make -C deb VERSION=0.0.1-dev ENGINE_DIR=$(pwd)/engine CLI_DIR=$(pwd)/cli ubuntu-xenial') | ||
| } finally { | ||
| sh('make ENGINE_DIR=$(pwd)/engine clean-engine') | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| 'rpm': { -> | ||
| stage('Centos 7 RPM Package') { | ||
| wrappedNode(label: 'ubuntu && x86_64', cleanWorkspace: true) { | ||
| checkout scm | ||
| sh('git clone https://github.com/docker/cli.git') | ||
| sh("git -C cli checkout $branch") | ||
| sh('git clone https://github.com/docker/engine.git') | ||
| sh("git -C engine checkout $branch") | ||
| sh('make -C rpm VERSION=0.0.1-dev ENGINE_DIR=$(pwd)/engine CLI_DIR=$(pwd)/cli centos-7') | ||
| try { | ||
| checkout scm | ||
| sh('git clone https://github.com/docker/cli.git') | ||
| sh("git -C cli checkout $branch") | ||
| sh('git clone https://github.com/docker/engine.git') | ||
| sh("git -C engine checkout $branch") | ||
| sh('make -C rpm VERSION=0.0.1-dev ENGINE_DIR=$(pwd)/engine CLI_DIR=$(pwd)/cli centos-7') | ||
| } finally { | ||
| sh('make ENGINE_DIR=$(pwd)/engine clean-engine') | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| 'static': { -> | ||
| stage('Static Linux Binaries') { | ||
| wrappedNode(label: 'ubuntu && x86_64', cleanWorkspace: true) { | ||
| checkout scm | ||
| sh('git clone https://github.com/docker/cli.git') | ||
| sh("git -C cli checkout $branch") | ||
| sh('git clone https://github.com/docker/engine.git') | ||
| sh("git -C engine checkout $branch") | ||
| sh('make VERSION=0.0.1-dev DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=$(pwd)/engine CLI_DIR=$(pwd)/cli static') | ||
| try { | ||
| checkout scm | ||
| sh('git clone https://github.com/docker/cli.git') | ||
| sh("git -C cli checkout $branch") | ||
| sh('git clone https://github.com/docker/engine.git') | ||
| sh("git -C engine checkout $branch") | ||
| sh('make VERSION=0.0.1-dev DOCKER_BUILD_PKGS=static-linux ENGINE_DIR=$(pwd)/engine CLI_DIR=$(pwd)/cli static') | ||
| } finally { | ||
| sh('make ENGINE_DIR=$(pwd)/engine clean-engine') | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| ] | ||
|
|
||
| arches = [ | ||
| "x86_64", | ||
| "aarch64", | ||
| "armhf" | ||
| ] | ||
|
|
||
| arches.each { | ||
| test_steps << genBranch(it) | ||
| } | ||
|
|
||
| parallel(test_steps) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wasn't sure if we needed this, but only the image-based build ran
clean-engine. Perhaps we should callmake -C deb ... cleanhere as well?