summaryrefslogtreecommitdiffstats
path: root/jjb/optf
diff options
context:
space:
mode:
authorvrvarma <vv8305@att.com>2020-01-10 11:21:00 -0500
committervrvarma <vv8305@att.com>2020-01-10 12:32:32 -0500
commitbf5b01444626c93939f31cc8ab18d411d8cdc7be (patch)
tree210865c592ca39a5580559479411f40cf36f6575 /jjb/optf
parent4c6f09248f3584a182501a54a9aac206ddf092df (diff)
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
Diffstat (limited to 'jjb/optf')
-rw-r--r--jjb/optf/optf-has-csit.yaml14
-rw-r--r--jjb/optf/optf-has.yaml12
-rw-r--r--jjb/optf/optf-osdf-csit.yaml14
-rw-r--r--jjb/optf/optf-osdf.yaml18
4 files changed, 44 insertions, 14 deletions
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
new file mode 100644
index 000000000..b1eeba661
--- /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 f08d7f997..27564c4ca 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 000000000..de079c3b7
--- /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 d5bcf23e4..55b71c978 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: