diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 6f0c160..72af197 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -20,7 +20,7 @@
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-      - gerrit-maven-docker-snapshot-PoC:
+      - gerrit-maven-docker-snapshot:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-snapshot-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index c620652..5593b10 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -39,7 +39,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
@@ -55,7 +55,7 @@
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos7-docker-8c-8g
 
 - project:
     name: cps-sonar
@@ -70,7 +70,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos7-docker-8c-8g
     project: 'cps'
     project-name: 'cps'
     branch: 'master'
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index e0b655d..da2b798 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -17,15 +17,6 @@
       - 'sniroemulator':
           pom: 'test/mocks/sniroemulator/pom.xml'
           pattern: 'test/mocks/sniroemulator/**'
-      - 'masspnfsim':
-          pom: 'test/mocks/masspnfsim/pnf-sim-lightweight/pom.xml'
-          pattern: 'test/mocks/masspnfsim/**'
-          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
-          post-docker-verify-script: |
-              #!/bin/bash
-              set -ex # Fail build if any setup step fails
-              cd $WORKSPACE/test/mocks/masspnfsim
-              tox
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/integration/integration-maven-jobs.yaml b/jjb/integration/integration-maven-jobs.yaml
index 5c7a503..259fb4e 100644
--- a/jjb/integration/integration-maven-jobs.yaml
+++ b/jjb/integration/integration-maven-jobs.yaml
@@ -1,4 +1,12 @@
+####################
+# COMMON FUNCTIONS #
+####################
+
 - integration_maven_common: &integration_maven_common
+    # This common maven base template is based on
+    # lf-maven-common in global-jjb/jjb/lf-maven-jobs.yaml
+    # and adjusted for jobs in project-specific CSIT flow
+
     name: integration-maven-common
 
     ######################
@@ -46,7 +54,7 @@
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
           submodule-disable: "{submodule-disable}"
-          choosing-strategy: default
+          choosing-strategy: "gerrit"
 
     wrappers:
       - lf-infra-wrappers:
@@ -96,8 +104,12 @@
       - lf-provide-maven-settings-cleanup
 
 - job-template:
+    # Job template for creating snapshot docker images
+    # identified by given unique tag with maven
+    # in project-specific CSIT flow
+
     name: "{project-name}-{stream}-maven-docker-snapshot"
-    id: gerrit-maven-docker-snapshot-PoC
+    id: gerrit-maven-docker-snapshot
     <<: *integration_maven_common
     # yamllint disable-line rule:key-duplicates
     <<: *integration_maven_docker_snapshot
@@ -120,7 +132,7 @@
     mvn-goals: clean deploy
     mvn-opts: ""
     mvn-params: ""
-    mvn-version: mvn35
+    maven-version: mvn36
     ossrh-profile-id: ""
     mvn-pom: ""
     sign-artifacts: false
@@ -136,5 +148,10 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
+
       - integration-unique-docker-tag:
           unique-docker-tag: ''
diff --git a/jjb/integration/simulators/integration-masspnf-simulator.yaml b/jjb/integration/simulators/integration-masspnf-simulator.yaml
new file mode 100644
index 0000000..8121708
--- /dev/null
+++ b/jjb/integration/simulators/integration-masspnf-simulator.yaml
@@ -0,0 +1,70 @@
+---
+- project:
+    name: integration-simulators-masspnf-simulator-project-view
+    project-name: integration-simulators-masspnf-simulator
+    views:
+      - project-view
+
+- project:
+    name: integration-simulators-masspnf-simulator-info
+    project: integration/simulators/masspnf-simulator
+    project-name: integration-simulators-masspnf-simulator
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- project:
+    name: integration-simulators-masspnf-simulator-docker
+    project-name: integration-simulators-masspnf-simulator
+    jobs:
+      - integration-docker-merge
+      - integration-docker-verify
+    project: integration/simulators/masspnf-simulator
+    stream:
+      - 'master':
+          branch: 'master'
+    subproject:
+      - 'masspnfsim':
+          pom: 'pnf-sim-lightweight/pom.xml'
+          pattern: '**'
+          mvn-goals: 'clean package docker:build -Dcheckstyle.skip'
+          post-docker-verify-script: |
+              #!/bin/bash
+              set -ex # Fail build if any setup step fails
+              cd $WORKSPACE/
+              tox -e pytest
+    mvn-settings: 'integration-settings'
+    files: '**'
+    archive-artifacts: ''
+
+- project:
+    name: integration-simulators-masspnf-simulator-linters
+    project: 'integration/simulators/masspnf-simulator'
+    project-name: 'integration-simulators-masspnf-simulator'
+    python-version: python3
+    jobs:
+      - integration-linters
+    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'
+      - 'python':
+          tox-dir: '.'
+          tox-envs: 'py'
+          pattern: '**/*.py'
+      - 'md':
+          tox-dir: '.'
+          tox-envs: 'md'
+          pattern: '**/*.md'
+    stream:
+      - 'master':
+          branch: 'master'
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index e02d612..2284650 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -36,6 +36,25 @@
     maven-version: 'mvn35'
 
 - project:
+    name: sdc-sdc-distribution-client-integration-pairwise
+    java-version: openjdk11
+    jobs:
+       - '{project-name}-{stream}-integration-pairwise'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'sdc/sdc-distribution-client'
+    project-name: 'sdc-sdc-distribution-client'
+    stream:
+        - 'master':
+            branch: 'master'
+            java-version: openjdk11
+    mvn-settings: 'sdc-sdc-distribution-client-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn35'
+    mvn-params: ' -P integration-pairwise'
+
+- project:
     name: sdc-sdc-distribution-client-sonar
     jobs:
       - gerrit-maven-sonar
diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index c72f904..e267407 100644
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -60,10 +60,12 @@
           tox-dir: '.'
           tox-envs: 'json'
           pattern: '**/*.json'
-#      - 'robot':
-#          tox-dir: '.'
-#          tox-envs: 'robot'
-#          pattern: '**/*.robot'
+      - 'robot':
+          tox-dir: '.'
+          tox-envs: 'robot'
+          pattern: 'robot/testsuites/usecases/*.robot'
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
diff --git a/jjb/vnfsdk/generate-dosc.sh b/jjb/vnfsdk/generate-dosc.sh
new file mode 100644
index 0000000..96ce897
--- /dev/null
+++ b/jjb/vnfsdk/generate-dosc.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mvn clean install -DskipDocsGeneration=false
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 1146d76..b95c3a7 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -70,11 +70,11 @@
       project-name: 'vnfsdk-requirements'
       mvn-settings: 'vnfsdk-validation-settings'
       mvn-global-settings: 'global-settings'
-      mvn-goals: 'clean install -DskipDocsGeneration=false'
       stream:
           - 'master':
                 branch: 'master'
       jobs:
           - '{project-name}-{stream}-build-and-upload':
+                pre_script: !include-raw-escape: ./generate-dosc.sh
                 project_id: org.onap.vnfsdk.refrepo
                 post_script: !include-raw-escape: ./upload-artifact.sh