This repository has been archived by the owner on Apr 17, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into fix/vars_case
Signed-off-by: Kitsu <[email protected]>
- Loading branch information
Showing
30 changed files
with
982 additions
and
506 deletions.
There are no files selected for viewing
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #!/usr/bin/env groovy | ||
|
|
||
| def checkCoverageConditions() { | ||
| // trigger coverage if branch is master, or it is a open PR commit, or a merge request | ||
| def branch_coverage = ['master'] | ||
|
|
||
| if ( params.coverage ) { | ||
| return true | ||
| } | ||
| else { | ||
| return env.GIT_LOCAL_BRANCH in branch_coverage || INITIAL_COMMIT_PR == "true" || MERGE_CONDITIONS_SATISFIED == "true" | ||
| } | ||
| } | ||
|
|
||
| return this |
This file contains 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 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,17 +1,23 @@ | ||
| #!/usr/bin/env groovy | ||
|
|
||
| // remove docker network and stale images | ||
| def doDockerCleanup() { | ||
| sh """ | ||
| # Check whether the image is the last-standing man | ||
| # i.e., no other tags exist for this image | ||
| docker rmi \$(docker images --no-trunc --format '{{.Repository}}:{{.Tag}}\\t{{.ID}}' | grep \$(docker images --no-trunc --format '{{.ID}}' ${iC.id}) | head -n -1 | cut -f 1) || true | ||
| """ | ||
| } | ||
|
|
||
| // cleanup docker network created for the test stage | ||
| def doDockerNetworkCleanup() { | ||
| sh "docker network rm ${env.IROHA_NETWORK}" | ||
| } | ||
|
|
||
| sh """ | ||
| # Check whether the image is the last-standing man | ||
| # i.e., no other tags exist for this image | ||
| docker rmi \$(docker images --no-trunc --format '{{.Repository}}:{{.Tag}}\\t{{.ID}}' | grep \$(docker images --no-trunc --format '{{.ID}}' ${iC.id}) | head -n -1 | cut -f 1) || true | ||
| sleep 5 | ||
| docker network rm $IROHA_NETWORK || true | ||
| #remove folder with iroha.deb package and Dockerfiles | ||
| rm -rf /tmp/${env.GIT_COMMIT}-${BUILD_NUMBER} | ||
| rm -rf /tmp/${env.GIT_COMMIT} | ||
| """ | ||
| // cleanup docker images which weren't used for more that 20 days and image for this PR in case of successful PR | ||
| def doStaleDockerImagesCleanup() { | ||
| sh "find ${JENKINS_DOCKER_IMAGE_DIR} -type f -mtime +20 -exec rm -f {} \\;" | ||
| sh "rm -f ${JENKINS_DOCKER_IMAGE_DIR}/${DOCKER_IMAGE_FILE}" | ||
| } | ||
|
|
||
| return this |
This file contains 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 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 |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // types of tests provided by the developers (can be found at the CMakeLists.txt files) | ||
| enum TestTypes { | ||
| module(0), integration(1), system(2), cmake(3), regression(4), benchmark(5), framework(6) | ||
| TestTypes(int order) { | ||
| this.order = order | ||
| } | ||
| private final int order | ||
| int getOrder() { | ||
| order | ||
| } | ||
| } | ||
| return this |
Oops, something went wrong.