summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGildas Lanilis <gildas.lanilis@huawei.com>2018-02-13 17:49:14 -0800
committerGildas Lanilis <gildas.lanilis@huawei.com>2018-02-13 17:54:09 -0800
commiteda92d586606e86735398610e616e3043d3a5017 (patch)
treed7742c9e345547799036519ed8ff43656024ec0e
parent7fda43da252221612237af02d3710855a8c43cd4 (diff)
Clean up Sonar and Jenkins
1)Remove Amsterdam branch visibility in Jenkins from logging-analytics repo 2)Remove Amsterdam branch visibility in Jenkins form clamp repo 3)Remove vnfsdk/compliance visibility in Sonar and Jenkins Change-Id: I8922ffa4c1e64df9130b08b809c1474c728dc8e5 Issue-ID: CIMAN-65 Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
-rw-r--r--jjb/clamp/clamp.yaml2
-rw-r--r--jjb/logging-analytics/logging-analytics.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-compliance-csit.yaml14
-rw-r--r--jjb/vnfsdk/vnfsdk-compliance.yaml42
4 files changed, 1 insertions, 61 deletions
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index b2c6ebe50..583540684 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -30,8 +30,6 @@
stream:
- 'master':
branch: 'master'
- - 'amsterdam':
- branch: 'amsterdam'
mvn-settings: 'clamp-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 3ebc1d817..f5c1f589c 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -18,8 +18,6 @@
stream:
- 'master':
branch: 'master'
- - 'amsterdam':
- branch: 'amsterdam'
mvn-settings: 'logging-analytics-settings'
files: '**'
archive-artifacts: ''
@@ -34,4 +32,4 @@
branch: 'master'
mvn-settings: 'logging-analytics-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml b/jjb/vnfsdk/vnfsdk-compliance-csit.yaml
deleted file mode 100644
index 6ed6fef66..000000000
--- a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: vnfsdk-compliance-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vnfsdk-compliance'
- stream: 'master'
- functionality:
- - 'sanity-check':
- trigger_jobs:
- - '{project-name}-{stream}-merge-java'
- robot-options: ''
- branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-compliance.yaml b/jjb/vnfsdk/vnfsdk-compliance.yaml
deleted file mode 100644
index 0041dda6c..000000000
--- a/jjb/vnfsdk/vnfsdk-compliance.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- project:
- name: vnfsdk-compliance
- project-name: 'vnfsdk-compliance'
- jobs:
- - gerrit-maven-clm:
- mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- mvn-goals: 'docker:build'
- docker-image-name: 'onap/compliance'
- - '{project-name}-{stream}-docker-version-java-daily':
- docker-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- mvn-profile: 'docker'
-
- project: 'vnfsdk/compliance'
- subproject:
- - 'veslibrary':
- pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- pattern: 'veslibrary/**'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vnfsdk-compliance-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
-- project:
- name: vnfsdk-compliance-sonar
- jobs:
- - gerrit-maven-sonar
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'vnfsdk/compliance'
- project-name: 'vnfsdk-compliance'
- branch: 'master'
- mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- mvn-settings: 'vnfsdk-compliance-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'