Merge "Remove amsterdam and openecomp jobs"

6 files changed, 5 insertions, 94 deletions

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 779dbcec2..69922ed14 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -21,27 +21,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
 - project:
-    name: policy-common-release-1.0.0
-    project-name: 'policy-common'
-    jobs:
-      - '{project-name}-{stream}-verify-java-skip-tests'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'policy/common'
-    stream:
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-      - 'amsterdam':
-          branch: 'amsterdam'
-    mvn-settings: 'policy-common-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
-- project:
     name: policy-common-sonar
     jobs:
       - gerrit-maven-sonar
@@ -52,4 +31,4 @@
     branch: 'master'
     mvn-settings: 'policy-common-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/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index f2b19e4a0..0ee0c854f 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -16,16 +16,11 @@
           mvn-goals: 'prepare-package'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-      - '{project-name}-docker-image-blessing'
 
     project: 'policy/docker'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-      - 'amsterdam':
-          branch: 'amsterdam'
     mvn-settings: 'policy-docker-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 93d277e25..da990ebd3 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -21,27 +21,6 @@
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
 - project:
-    name: policy-drools-applications-release-1.0.0
-    project-name: 'policy-drools-applications'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'policy/drools-applications'
-    stream:
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-      - 'amsterdam':
-          branch: 'amsterdam'
-    mvn-settings: 'policy-drools-applications-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-basebuild-4c-4g'
-- project:
     name: policy-drools-applications-sonar
     jobs:
       - gerrit-maven-sonar
@@ -52,4 +31,4 @@
     branch: 'master'
     mvn-settings: 'policy-drools-applications-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/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index ddf6fd1ca..a25d11ad6 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -22,27 +22,6 @@
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
 - project:
-    name: policy-drools-pdp-release-1.0.0
-    project-name: 'policy-drools-pdp'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'policy/drools-pdp'
-    stream:
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-      - 'amsterdam':
-          branch: 'amsterdam'
-    mvn-settings: 'policy-drools-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-basebuild-4c-4g'
-- project:
     name: policy-drools-pdp-sonar
     jobs:
       - gerrit-maven-sonar
@@ -53,4 +32,4 @@
     branch: 'master'
     mvn-settings: 'policy-drools-pdp-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/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index a66e006fc..9edcd1dbf 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -22,27 +22,6 @@
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
 - project:
-    name: policy-engine-release-1.0.0
-    project-name: 'policy-engine'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'policy/engine'
-    stream:
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-      - 'amsterdam':
-          branch: 'amsterdam'
-    mvn-settings: 'policy-engine-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-basebuild-4c-4g'
-- project:
     name: policy-engine-sonar
     jobs:
       - gerrit-maven-sonar
@@ -53,4 +32,4 @@
     branch: 'master'
     mvn-settings: 'policy-engine-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/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index 1c7338966..821d5671b 100644
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -30,4 +30,4 @@
     branch: 'master'
     mvn-settings: 'policy-pdp-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'