Merge "Adding csit-verify jobs for oof projects"

diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml
new file mode 100644 (file)
index 0000000..fbf56a4
--- /dev/null
+++ b/jjb/integration/usecases/integration-usecases-bbs.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+    name: integration-usecases-bbs-info
+    project-name: integration-usecases-bbs
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: integration/usecases/bbs
+    branch: master
+
+- project:
+    name: integration-usecases-bbs-linters
+    project: integration/usecases/bbs
+    project-name: integration-usecases-bbs
+    python-version: python3
+    jobs:
+      - '{project-name}-{stream}-{subproject}-lint'
+    subproject:
+      - 'yaml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
+      - 'json':
+          tox-dir: '.'
+          tox-envs: 'json'
+          pattern: '**/*.json'
+    stream:
+      - 'master':
+          branch: 'master'

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 2bc95a3..97dc567 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -5,52 +5,21 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java':
-          project-name: 'policy-pap-amd64'
           docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1804-docker-8c-8g
-          pattern: 'do_not_match_any_file'
-      - '{project-name}-{stream}-merge-java':
-          project-name: 'policy-pap-arm64'
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1804-docker-arm64-4c-2g
-          pattern: 'do_not_match_any_file'
+          mvn-params: '-P docker'
+          build-node: ubuntu1604-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-      - '{project-name}-multiarch-{stream}-merge-java':
-          build-node: ubuntu1804-docker-8c-8g
-      - gerrit-maven-docker-stage:
-          project-name: 'policy-pap-arm64'
-          build-node: ubuntu1804-docker-arm64-4c-2g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          container-public-registry: 'docker.io'
-          container-staging-registry: 'docker.io'
-          cron: ''
-          gerrit_trigger_file_paths:
-             - compare-type: REG_EXP
-               pattern: 'do_not_match_any_file'
       - gerrit-maven-docker-stage:
-          project-name: 'policy-pap-amd64'
-          build-node: centos7-docker-8c-8g
+          build-node: ubuntu1604-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          container-public-registry: 'docker.io'
-          container-staging-registry: 'docker.io'
-          cron: ''
-          gerrit_trigger_file_paths:
-             - compare-type: REG_EXP
-               pattern: 'do_not_match_any_file'
-      - '{project-name}-docker-manifest-{stream}':
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-      - '{project-name}-multiarch-docker-stage-{stream}'
 
     project: 'policy/pap'
     stream: