Refactoring 'pylog' submodule jobs

As submodule pylog is being built as part of parent logging-analytics module,
so there is no need of verify-java and merge-java jobs for submodule.

Change-Id: If697680cc19ddc9070a90d9d97540a52ea00a952
Issue-ID: CIMAN-366
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 5d936a8..91df1b5 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -52,6 +52,7 @@
 #    archive-artifacts: ''
 #    build-node: ubuntu1604-docker-arm64-4c-2g
 #
+
 - project:
     name: logging-analytics-sonar
     jobs:
@@ -72,43 +73,24 @@
 
 - project:
     name: logging-analytics-pylog
-    project-name: 'logging-analytics-pylog'
+    project-name: 'logging-analytics'
     project: 'logging-analytics'
     python-version: python3
+    tox-dir: 'pylog/'
+    tox-envs: ''
     stream:
       - 'master':
           branch: 'master'
+    build-node: ubuntu1604-builder-4c-4g
     mvn-settings: 'logging-analytics-settings'
     subproject:
       - 'pylog':
-          pom: 'pylog/pom.xml'
           pattern: 'pylog/**'
-          tox-dir: pylog/
-          tox-envs: ''
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-
-- project:
-    name: logging-analytics-pylog-python
-    project-name: 'logging-analytics-pylog'
-    project: 'logging-analytics'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'logging-analytics-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    subproject:
-      - 'pylog':
           path: 'pylog'
-          pattern: 'pylog/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
 
 - project:
     name: logging-analytics-info