diff options
-rw-r--r-- | jjb/demo/demo.yaml | 2 | ||||
-rw-r--r-- | jjb/global-templates-python.yaml | 2 | ||||
-rw-r--r-- | jjb/integration/integration.yaml | 2 | ||||
-rw-r--r-- | jjb/lab/lab.yaml | 8 |
4 files changed, 1 insertions, 13 deletions
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 9b47fdcd4..a86ded70a 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -13,8 +13,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'demo-settings' files: '**' archive-artifacts: '' diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 98312bb55..88aef7aeb 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -192,7 +192,7 @@ build-timeout: '{build-timeout}' triggers: - - timed: '@daily' + - timed: 'H */4 * * *' - gerrit-trigger-release-manually: server: '{server-name}' project: '{project}' diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index f76f89211..6c700fb61 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml index 65820bf5a..bb62728fd 100644 --- a/jjb/lab/lab.yaml +++ b/jjb/lab/lab.yaml @@ -4,14 +4,6 @@ jobs: - 'lab-{job-name}' job-name: - - "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" - - "tlab-beijing-heat-deploy": - job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant" - - "tlab-beijing-oom-deploy": - job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant" - "windriver-heat-daily": job-desc: "Heat-based deployment into Wind River lab Integration-HEAT-Daily tenant" - "windriver-oom-daily": |