Merge "Delete cadi & inno templates,modify authz"

4 files changed, 0 insertions, 97 deletions

diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
deleted file mode 100644
index c89d87843..000000000
--- a/jjb/aaf/aaf-authz-docker.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-
-- project:
-    name: aaf-authz-docker
-    project-name: 'aaf-authz-docker'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java-checkstyle'
-      - '{project-name}-{stream}-merge-properties-java':
-         mvn_properties:
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         setVersion: 'DontSetVersion'
-         mvn_properties:
-          - skipDockerBuild=true
-          - skipDockerTag=true
-          - skipDockerPush=true
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         setVersion: 'DontSetVersion'
-         docker-pom: 'authz-service/pom.xml'
-         mvn-profile: 'docker'
-         maven-properties: |
-          skip.docker.build=false
-          skip.docker.tag=false
-          skip.docker.push=false
-          aaf-authz-docker.registry=$
-
-    project: 'aaf/authz'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aaf-authz-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 4850eda79..918c581b4 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -7,16 +7,11 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          mvn-goals: 'docker:build'
     project: 'aaf/authz'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'aaf-authz-settings'
-    mvn-profile: docker
-    docker-pom: 'authz-service/pom.xml'
     files: '**'
     archive-artifacts: ''
 - project:
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
deleted file mode 100644
index 8943f5cd8..000000000
--- a/jjb/aaf/aaf-cadi.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: aaf-cadi
-    project-name: 'aaf-cadi'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-    project: 'aaf/cadi'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aaf-cadi-settings'
-    files: '**'
-    archive-artifacts: ''
-- project:
-    name: aaf-cadi-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aaf/cadi'
-    project-name: 'aaf-cadi'
-    branch: 'master'
-    mvn-settings: 'aaf-cadi-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml
deleted file mode 100644
index 0620e1fb6..000000000
--- a/jjb/aaf/aaf-inno.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: aaf-inno
-    project-name: 'aaf-inno'
-    jobs:
-      - gerrit-maven-clm:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-    project: 'aaf/inno'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aaf-inno-settings'
-    files: '**'
-    archive-artifacts: ''
-- project:
-    name: aaf-inno-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aaf/inno'
-    project-name: 'aaf-inno'
-    branch: 'master'
-    mvn-settings: 'aaf-inno-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'