Clean up jjb and update csit jobs for oof
Switching the build-nodes for docker jobs for osdf
Change-Id: Ibcc83b3d2aee7bfc8db5809f8c3e8722a13d18b5
Signed-off-by: vrvarma <vv8305@att.com>
Issue-ID: OPTFRA-673
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
new file mode 100644
index 0000000..b1eeba6
--- /dev/null
+++ b/jjb/optf/optf-has-csit.yaml
@@ -0,0 +1,14 @@
+- project:
+ name: optf-has-csit
+ jobs:
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: optf-has
+ recipients: 'snarayanan@research.att.com'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'testsuites':
+ trigger_jobs:
+ - '{project-name}-{stream}-conductor-docker-java-version-shell-daily'
+ robot-options: ''
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index f08d7f9..27564c4 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -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 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-has-settings'
subproject:
- 'conductor':
@@ -97,8 +97,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-has-settings'
- project:
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
new file mode 100644
index 0000000..de079c3
--- /dev/null
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -0,0 +1,14 @@
+- project:
+ name: optf-osdf-csit
+ jobs:
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: optf-osdf
+ recipients: 'snarayanan@research.att.com'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'testsuites':
+ trigger_jobs:
+ - '{project-name}-{stream}-osdf-docker-java-version-shell-daily'
+ robot-options: ''
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index d5bcf23..55b71c9 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -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 @@
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 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-osdf-settings'
subproject:
- 'osdf':
@@ -96,8 +98,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'optf-osdf-settings'
- project: