Merge "Clean up jjb and update csit jobs for oof Switching the build-nodes for docker...

diff --combined jjb/optf/optf-has.yaml
index bc9ff63,27564c4..afffec3
--- 1/jjb/optf/optf-has.yaml
--- 2/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@@ -6,8 -6,8 +6,8 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'dublin':
-           branch: 'dublin'
+       - 'elalto':
+           branch: 'elalto'
      mvn-settings: 'optf-has-settings'
      subproject:
        - 'conductor':
@@@ -45,8 -45,8 +45,8 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'dublin':
-           branch: 'dublin'
+       - 'elalto':
+           branch: 'elalto'
      mvn-settings: 'optf-has-settings'
      subproject:
        - 'conductor':
@@@ -77,7 -77,7 +77,7 @@@
      sonarcloud-project-organization: '{sonarcloud_project_organization}'
      sonarcloud-api-token: '{sonarcloud_api_token}'
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 -    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
 +    sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
      build-node: ubuntu1604-builder-4c-4g
      project: 'optf/has'
@@@ -97,8 -97,8 +97,8 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'dublin':
-           branch: 'dublin'
+       - 'elalto':
+           branch: 'elalto'
      mvn-settings: 'optf-has-settings'
  
  - project:

diff --combined jjb/optf/optf-osdf.yaml
index 4174a93,55b71c9..1f03cb6
--- 1/jjb/optf/optf-osdf.yaml
--- 2/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@@ -6,8 -6,8 +6,8 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'dublin':
-           branch: 'dublin'
+       - 'elalto':
+           branch: 'elalto'
      mvn-settings: 'optf-osdf-settings'
      subproject:
        - 'osdf':
@@@ -15,8 -15,10 +15,10 @@@
            pattern: '**'
            pom: 'pom.xml'
      jobs:
-       - '{project-name}-{stream}-{subproject}-verify-python'
-       - '{project-name}-{stream}-{subproject}-merge-java'
+       - '{project-name}-{stream}-{subproject}-verify-python':
+           build-node: ubuntu1604-builder-4c-4g
+       - '{project-name}-{stream}-{subproject}-merge-java':
+           build-node: ubuntu1604-docker-8c-8g
        - gerrit-maven-stage:
            sign-artifacts: true
            build-node: centos7-docker-8c-8g
@@@ -43,8 -45,8 +45,8 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'dublin':
-           branch: 'dublin'
+       - 'elalto':
+           branch: 'elalto'
      mvn-settings: 'optf-osdf-settings'
      subproject:
        - 'osdf':
@@@ -75,7 -77,7 +77,7 @@@
      sonarcloud-project-organization: '{sonarcloud_project_organization}'
      sonarcloud-api-token: '{sonarcloud_api_token}'
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 -    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
 +    sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
      build-node: ubuntu1604-builder-4c-4g
      project: 'optf/osdf'
@@@ -96,8 -98,8 +98,8 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'dublin':
-           branch: 'dublin'
+       - 'elalto':
+           branch: 'elalto'
      mvn-settings: 'optf-osdf-settings'
  
  - project: