X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foom%2Foom-consul.yaml;h=0c9b1edc002c8f877bad0b8bc4808cb1c6e45e00;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=caff95b2e2b1bd5f9d60023cbfc9087265071201;hpb=7c994f4f29dc5daf8cdcb87750a732075295eaab;p=ci-management.git

diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml
index caff95b2e..0c9b1edc0 100644
--- a/jjb/oom/oom-consul.yaml
+++ b/jjb/oom/oom-consul.yaml
@@ -6,60 +6,51 @@
       - project-view
 
 - project:
-    name: oom-consul-info
+    name: oom-consul-linters
     project: oom/consul
     project-name: oom-consul
-    build-node: centos8-builder-2c-1g
+    python-version: python3
     jobs:
-      - gerrit-info-yaml-verify
-
-- project:
-      name: oom-consul-linters
-      project: oom/consul
-      project-name: oom-consul
-      python-version: python3
-      jobs:
-          - oom-linters
-      subproject:
-          - 'yaml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yaml'
-          - 'yml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yml'
-          - 'py':
-                tox-dir: '.'
-                tox-envs: 'python'
-                pattern: '**/*.python'
-      stream:
-          - 'master':
-                branch: 'master'
-
+      - oom-linters
+    subproject:
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "py":
+          tox-dir: "."
+          tox-envs: "python"
+          pattern: "**/*.python"
+    stream:
+      - "master":
+          branch: "master"
 
 - project:
-   name: oom-consul-release
-   project-name: oom-consul
-   project: oom/consul
-   mvn-settings: 'oom-settings'
-   jobs:
-     - '{project-name}-gerrit-release-jobs':
-         build-node: centos7-docker-8c-8g
+    name: oom-consul-release
+    project-name: oom-consul
+    project: oom/consul
+    mvn-settings: "oom-settings"
+    jobs:
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
 - project:
-    name: 'oom-consul-docker'
+    name: "oom-consul-docker"
     jobs:
       - gerrit-docker-verify
       - gerrit-docker-merge
-    project-name: 'oom-consul'
-    project: 'oom/consul'
+    project-name: "oom-consul"
+    project: "oom/consul"
     stream:
-      - 'master':
-            branch: 'master'
-            files: ''
-    docker-name: 'onap/oom/consul'
-    docker-build-args: '-f ./Dockerfile'
-    docker-root: '$WORKSPACE'
-    mvn-settings: 'oom-settings'
+      - "master":
+          branch: "master"
+          files: ""
+    docker-name: "onap/oom/consul"
+    docker-build-args: "-f ./Dockerfile"
+    docker-root: "$WORKSPACE"
+    mvn-settings: "oom-settings"
     build-node: ubuntu1804-docker-8c-8g