summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-01-31 10:30:11 -0800
committerGary Wu <gary.i.wu@huawei.com>2018-01-31 12:00:02 -0800
commit40da977b01ded46789a41d12810e82ad4de8e283 (patch)
tree741069962c8850a6c77d7806c87cc9bbfafef6ca
parent39fd5fbe8ffd61a3123d76879d61acd0ee42373e (diff)
Refactor external lab jobs
Change-Id: Iede6c823593af8f929fcbc727193df2c4a8b328c Issue-ID: INT-401 Issue-ID: INT-402 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--jjb/lab/lab-templates.yaml6
-rw-r--r--jjb/lab/lab.yaml15
2 files changed, 10 insertions, 11 deletions
diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
index 6d37da5e0..b35344083 100644
--- a/jjb/lab/lab-templates.yaml
+++ b/jjb/lab/lab-templates.yaml
@@ -1,10 +1,10 @@
---
- job-template:
- name: 'lab-{lab-name}-{env-name}-{job-name}'
+ name: 'lab-{job-name}'
+ description: '{job-desc}'
disabled: false
project-type: freestyle
build-node: ubuntu1604-basebuild-2c-1g
- auth-token: lab
properties:
- lf-infra-properties:
@@ -31,6 +31,6 @@
publishers:
- integration-robot:
- unstable-if: 0.0
+ unstable-if: 75.0
pass-if: 100.0
- lf-infra-publish
diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml
index 550c2e780..33feae4bc 100644
--- a/jjb/lab/lab.yaml
+++ b/jjb/lab/lab.yaml
@@ -2,12 +2,11 @@
- project:
name: lab
jobs:
- - 'lab-{lab-name}-{env-name}-{job-name}'
- lab-name:
- - "windriver"
- env-name:
- - "beijing-heat"
- - "beijing-oom"
+ - 'lab-{job-name}'
job-name:
- - "deploy"
- - "healthcheck"
+ - "windriver-beijing-heat-deploy":
+ job-desc: "Heat-based deployment into Wind River lab Integration-Stable tenant"
+ - "windriver-beijing-oom-deploy":
+ job-desc: "OOM-based deployment into Wind River lab Integration-Jenkins tenant"
+ - "aws-beijing-oom-deploy":
+ job-desc: "OOM-based deployment into AWS"