Tag linter and docker-compose integration jobs with id

[ci-management.git] / jjb / integration / integration.yaml

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 62a0bed..5111c4d 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -49,54 +49,41 @@
     golangver: 'golang112'
     mvn-settings: 'integration-settings'
     archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-golang':
+      - '{project-name}-{stream}-{subproject}-verify-golang'
+    subproject:
+      - 'test-security-k8s':
+          path: 'test/security/k8s'
+          pattern: '{path}/**'
+          build-node: ubuntu1804-builder-4c-4g
           script: |
               #!/bin/bash
               set -ex # Fail build if any setup step fails
               cd $WORKSPACE/{path}
               make test
-    subproject:
-      - 'test-security-k8s':
-          path: 'test/security/k8s'
-          pattern: '{path}/**'
       - 'test-security-sslendpoints':
           path: 'test/security/sslendpoints'
           pattern: '{path}/**'
+          build-node: ubuntu1804-docker-8c-8g
+          script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/{path}
+              rm -rf $WORKSPACE/{path}/bin
+              make docker-build
+              make test
+              make clean
     stream:
       - 'master':
           branch: 'master'
 
-- project:
-    name: integration-netconf-pnp-simulator
-    project: integration
-    stream:
-      - 'master':
-          branch: 'master'
-    # Required by verifier
-    mvn-settings: 'integration-settings'
-    project-name: 'integration-netconf-pnp-simulator'
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
-    docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
-    docker-root: test/mocks/netconf-pnp-simulator/engine
-    container-tag-method: yaml-file
-    post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh
-    build-node: centos7-docker-8c-8g
-    build-timeout: 20
-    jobs:
-      - gerrit-docker-verify
-      - gerrit-docker-merge
-
 - project:
     name: integration-linters
     project: 'integration'
     project-name: 'integration'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'