Skip to content

Commit

Permalink
INDY-902: CI CD fixes
Browse files Browse the repository at this point in the history
Signed-off-by: ArtObr <[email protected]>
  • Loading branch information
ArtObr committed Nov 21, 2018
1 parent d2c1c07 commit 048d3c3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 32 deletions.
25 changes: 1 addition & 24 deletions Jenkinsfile.cd
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,6 @@ def nodeTestUbuntu = {
}
}

def clientTestUbuntu = {
try {
echo 'Ubuntu Test: Checkout csm'
checkout scm

echo 'Ubuntu Test: Build docker image'
def testEnv = dockerHelpers.build(name)

testEnv.inside('--network host') {
echo 'Ubuntu Test: Install dependencies'
testHelpers.install()

echo 'Ubuntu Test: Test'
testHelpers.testRunner([resFile: "test-result-client.${NODE_NAME}.txt", testDir: 'indy_client'])
//testHelpers.testJUnit(resFile: "test-result-client.${NODE_NAME}.xml")
}
}
finally {
echo 'Ubuntu Test: Cleanup'
step([$class: 'WsCleanup'])
}
}

def commonTestUbuntu = {
try {
echo 'Ubuntu Test: Checkout csm'
Expand Down Expand Up @@ -91,4 +68,4 @@ options = new TestAndPublishOptions()
options.enable([StagesEnum.PACK_RELEASE_COPY, StagesEnum.PACK_RELEASE_COPY_ST])
options.setCopyWithDeps(true)
options.setPrContexts([env.INDY_GITHUB_PR_REQUIRED_CONTEXT ?: "ci/hyperledger-jenkins/pr-merge"])
testAndPublish(name, [ubuntu: [node: nodeTestUbuntu, client: clientTestUbuntu, common: commonTestUbuntu]], true, options, [ubuntu: buildDebUbuntu])
testAndPublish(name, [ubuntu: [node: nodeTestUbuntu, common: commonTestUbuntu]], true, options, [ubuntu: buildDebUbuntu])
8 changes: 0 additions & 8 deletions Jenkinsfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,6 @@ def tests = [
python: python
)
},
client: { python ->
test(
resFile: "test-result-client.${NODE_NAME}.txt",
testDir: 'indy_client',
python: python,
useRunner: true
)
},
node: { python ->
test(
resFile: "test-result-node.${NODE_NAME}.txt",
Expand Down

0 comments on commit 048d3c3

Please sign in to comment.