diff --git a/Jenkinsfile b/Jenkinsfile index 3b0681f..65ac774 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,52 +3,10 @@ hose { EMAIL = 'cd' DEPLOYONPRS = false - BUILDTOOL = 'docker' - GENERATE_QA_ISSUE = true - JIRAPROJECT = 'cd-test-project' - // GRYPE_TEST = true -// ANCHORE_NIGHTLY_JOB = true + //BUILDTOOL = 'docker' + BUILDTOOL_IMAGE = "maven:3.8.5-openjdk-11" -// ITSERVICES = [ -// ['ZOOKEEPER': [ -// 'image': 'jplock/zookeeper:3.5.2-alpha', -// 'healthcheck': 2181, -// 'env': [ -// 'zk_id=1'], -// 'sleep': 5]]] - -// ATSERVICES = [ -// ['ZOOKEEPER': [ -// 'image': 'jplock/zookeeper:3.5.2-alpha', -// 'env': [ -// 'zk_id=1', -// 'USER=\$REMOTE_USER'], -// 'sleep': 5]]] - // MAVEN_ADDITIONAL_POM = ['legacy_pom.xml', 'pom.xml'] DEV = { config -> -// def extraWildcards = ["testsAT/target/executions/**/*.mp4", "testsAT/target/executions/**/*.jpg", "testsAT/target/executions/**/*.txt", "testsAT/**/*.html"] - -// doAT(conf:config, extraArchiveWildcards: extraWildcards) -// parallel(case_a: { -// useClonedVolume(config) { volumneName -> -// //doCompile(config) -// //doDockers(conf:config, dockerImages: [[conf: config, image: "cd-test"], [conf: config, image: "cd-test"]]) -// doDockers(conf:config, dockerImages:[[conf:config, dockerfile: "Dockerfile", image: "cd-test"], [conf:config, dockerfile:"Dockerfile.test2", image: "cd-test2"]], volumeName: volumneName) -// //doDocker(conf: config) - -// //doRenameImages(conf: config) -// } -// }, -// case_b: { -// //doCompile(config) -// //doDockers(conf:config, dockerImages: [[conf: config, image: "cd-test"], [conf: config, image: "cd-test"]]) -// doDockers(conf:config, dockerImages:[[conf:config, dockerfile: "Dockerfile", image: "cd-test"], [conf:config, dockerfile:"Dockerfile.test2", image: "cd-test2"]], volumeName: volumneName) -// //doDocker(conf: config) - -// //doRenameImages(conf: config) - -// } -// ) doDockers(conf:config, dockerImages:[[conf:config, dockerfile: "Dockerfile.test2", image: "cd-test-2"]]) } diff --git a/pom.xml b/pom.xml index fb083cd..ce515d4 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ com.stratio parent - 0.12.0 + 0.14.0 cd-test diff --git a/testsAT/pom.xml b/testsAT/pom.xml index eb9fd28..592b85b 100644 --- a/testsAT/pom.xml +++ b/testsAT/pom.xml @@ -6,7 +6,7 @@ com.stratio parent - 0.12.0-SNAPSHOT + 0.14.0 cd-test.testsAT