summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/clamp/clamp.yaml8
-rw-r--r--jjb/dmaap/dmaap-messagerouter-docker.yaml5
-rw-r--r--jjb/optf/optf-osdf-csit.yaml14
3 files changed, 3 insertions, 24 deletions
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 04519c726..8fe988264 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -15,19 +15,13 @@
- '{project-name}-{stream}-release-java-daily-checkstyle':
setVersion: 'DoSetVersion'
mvn_properties:
- - skipDockerBuild=true
- - skipDockerTag=true
- - skipDockerPush=true
- docker.pull.registry=nexus3.onap.org:10001
- '{project-name}-{stream}-docker-java-properties-daily':
setVersion: 'DoSetVersion'
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- mvn-params: '-X -Dmaven.test.skip=true'
+ mvn-params: '-Dmaven.test.skip=true'
maven-properties: |
- skip.docker.build=false
- skip.docker.tag=false
- skip.docker.push=false
clamp.registry=$
project: 'clamp'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 26327aec6..0b1cfb3ee 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -5,9 +5,8 @@
project-name: 'dmaap-messagerouter-docker'
jobs:
- gerrit-maven-clm:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ mvn-params: '-Dmaven.test.skip=true'
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
project: 'dmaap/messagerouter/messageservice'
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
deleted file mode 100644
index 9c1a558eb..000000000
--- a/jjb/optf/optf-osdf-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: optf-osdf-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'optf-osdf'
- stream: 'master'
- functionality:
- - 'osdf':
- trigger_jobs:
- - 'optf-osdf-master-osdf-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'