Remove Amsterdam Job from Jenkins

[ci-management.git] / jjb / vfc / vfc-nfvo-resmanagement.yaml

diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 2bf363c..c8888f7 100644 (file)
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -8,12 +8,26 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     build-node: ubuntu1604-basebuild-4c-4g
     jobs:
+      - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-version-java-daily':
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
           docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
+- project:
+    name: vfc-nfvo-resmanagement-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-basebuild-4c-4g
+    project: 'vfc/nfvo/resmanagement'
+    project-name: 'vfc-nfvo-resmanagement'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-resmanagement-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'