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>
diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
index 6d37da5..b353440 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 550c2e7..33feae4 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"