Chore: Update CLM jobs to run only on master

[ci-management.git] / jjb / optf / optf-has.yaml

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index c07a769..8fcd743 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.1.1':
-          branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
@@ -15,29 +15,64 @@
           pattern: 'conductor/**'
           pom: 'pom.xml'
     jobs:
-      - gerrit-maven-clm
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-optf-has-docker-image.sh'
+      - '{project-name}-{stream}-{subproject}-verify-python':
+          build-node: ubuntu1804-builder-4c-4g
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-docker-8c-8g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          docker-pom: 'conductor/pom.xml'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
+
 - project:
     name: optf-has-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/has'
     project-name: 'optf-has'
     branch: 'master'
     mvn-settings: 'optf-has-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: optf-has-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: optf/has
+    project-name: 'optf-has'
+    build-node: ubuntu1804-docker-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'optf-has-settings'
+
+- project:
+    name: optf-has-info
+    project-name: optf-has
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: optf/has
+    branch: master