Merge "Add job to push docker image"

diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 8a4cf0d..189d26b 100644 (file)
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -48,3 +48,31 @@
     jobs:
       - gerrit-docker-verify
       - gerrit-docker-merge
+
+- project:
+      name: integration-ran-nssmf-simulator
+      project: integration
+      stream:
+          - 'master':
+                branch: 'master'
+      # Required by verifier
+      mvn-settings: 'integration-settings'
+      project-name: 'integration-ran-nssmf-simulator'
+      gerrit_trigger_file_paths:
+          - compare-type: REG_EXP
+            pattern: 'test/mocks/ran-nssmf-simulator/.*'
+      docker-name: 'onap/ran-nssmf-simulator'
+      docker-root: test/mocks/ran-nssmf-simulator
+      container-tag-method: yaml-file
+      post_docker_build_script: |
+          #!/bin/bash
+          set -eux
+          cd "$DOCKER_ROOT"
+          # To simplify the references inside tox.ini and tests/settings.py
+          docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" ran-nssmf-simulator:latest
+          tox
+      build-node: ubuntu1804-docker-8c-8g
+      build-timeout: 20
+      jobs:
+          - gerrit-docker-verify
+          - gerrit-docker-merge

diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
index 73a604b..fc6d72c 100644 (file)
--- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
@@ -25,8 +25,14 @@
             mvn-goals: 'clean install'
         - '{project-name}-{stream}-merge-java':
             mvn-goals: 'clean deploy'
-        -  '{project-name}-gerrit-release-jobs':
+        - '{project-name}-gerrit-release-jobs':
             build-node: centos7-docker-8c-8g
+        - gerrit-maven-docker-stage:
+            build-node: centos7-docker-8c-8g
+            maven-versions-plugin: true
+            container-public-registry: 'nexus3.onap.org:10001'
+            container-staging-registry: 'nexus3.onap.org:10003'
+            mvn-params: '-P docker'
         - gerrit-maven-stage:
             sign-artifacts: true
             build-node: centos7-docker-8c-8g