diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/aai/aai-data-router.yaml | 2 | ||||
-rw-r--r-- | jjb/aai/aai-model-loader.yaml | 2 | ||||
-rw-r--r-- | jjb/aai/aai-search-data-service.yaml | 2 | ||||
-rw-r--r-- | jjb/aai/aai-sparky-be.yaml | 2 | ||||
-rw-r--r-- | jjb/appc/appc-master.yaml | 3 | ||||
-rw-r--r-- | jjb/cli/cli-csit.yaml | 4 | ||||
-rw-r--r-- | jjb/cli/cli.yaml | 2 | ||||
-rw-r--r-- | jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml | 2 | ||||
-rw-r--r-- | jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml | 2 | ||||
-rw-r--r-- | jjb/multicloud/multicloud-openstack.yaml | 1 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml | 1 |
11 files changed, 13 insertions, 10 deletions
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 125ec0e92..a3c15ee4a 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index f62c8d775..ac761c518 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 6d32697b5..de9af76f0 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 2b5b17498..8f49eb3de 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 2a5a01d94..19ef02097 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -9,9 +9,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'appc' stream: diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml index 798b16c19..48d1151ef 100644 --- a/jjb/cli/cli-csit.yaml +++ b/jjb/cli/cli-csit.yaml @@ -5,7 +5,9 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'cli' - stream: 'master' + stream: + - 'master': + branch: 'master' functionality: - 'sanity-check': trigger_jobs: diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 03180f440..723e96932 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -21,6 +21,8 @@ stream: - 'master': branch: 'master' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'cli-settings' files: '**' archive-artifacts: '' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml index b40bd84b1..ee8de9c79 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml @@ -10,6 +10,6 @@ functionality: - 'APIs': trigger_jobs: - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 5205d2c3c..2b7696859 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -16,7 +16,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-properties-daily': setVersion: 'DontSetVersion' docker-pom: 'javatoscachecker/pom.xml' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 94ac2ab84..655bd8cd1 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -24,6 +24,7 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml index 68e0e644c..a1af3b773 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml @@ -15,6 +15,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g |