separate tests for branches, replaces gerrit 10666
Change-Id: I671bffbf7f5d3cf300400161ca3de74c3c19d55d
diff --git a/jjb/triggered-api-test.yaml b/jjb/triggered-api-test.yaml
index 5c56f1b..08208ee 100644
--- a/jjb/triggered-api-test.yaml
+++ b/jjb/triggered-api-test.yaml
@@ -5,14 +5,14 @@
id: triggered-api-test
name: 'verify_{project}{name-extension}_triggered-api-test'
description: |
- Triggers an api test in a pipeline post-merge or on a schedule.
+ Triggers an api test in a pipeline post-merge and on a schedule.
Created by {id} job-template from ci-management/jjb/triggered-api-test.yaml, using pipeline: {pipeline_script}
triggers:
- cord-infra-gerrit-trigger-merge:
gerrit-server-name: '{gerrit-server-name}'
project-regexp: '^{project}$'
- branch-regexp: '{branch-regexp}'
+ branch-regexp: '^{branch}$'
file-include-regexp: '{all-files-regexp}'
dependency-jobs: '{dependency-jobs}'
- timed: '{timed-trigger}'
@@ -40,7 +40,7 @@
- string:
name: manifestBranch
- default: '$GERRIT_BRANCH'
+ default: '{branch}'
description: 'Name of the repo branch to use'
project-type: pipeline
diff --git a/jjb/verify/helm-charts.yaml b/jjb/verify/helm-charts.yaml
index 37ca0de..3c119c6 100644
--- a/jjb/verify/helm-charts.yaml
+++ b/jjb/verify/helm-charts.yaml
@@ -9,8 +9,13 @@
- 'verify-helm-charts-jobs':
branch-regexp: '{modern-branches-regexp}'
- 'post-merge-helm-charts-jobs':
- branch-regexp: '{modern-branches-regexp}'
- timed-trigger: '{every-four-hours}'
+ branch: 'master'
+ name-extension: '-master'
+ timed-trigger: '{twice-a-day}'
+ - 'post-merge-helm-charts-jobs':
+ branch: 'cord-6.0'
+ name-extension: '-cord6.0'
+ timed-trigger: '{once-a-day}'
- job-group:
name: 'verify-helm-charts-jobs'