diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd index 1f2e9efc0..ddb434f4d 100644 --- a/Jenkinsfile.cd +++ b/Jenkinsfile.cd @@ -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' @@ -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]) diff --git a/Jenkinsfile.ci b/Jenkinsfile.ci index b5edb3d4e..9041bf0ba 100644 --- a/Jenkinsfile.ci +++ b/Jenkinsfile.ci @@ -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",