diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2017-12-13 22:47:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-12-13 22:47:36 +0000 |
| commit | ed5b82f048a7d38a70881f33cf68bbd48408e317 (patch) | |
| tree | 1da3bbd7e4f8686f9c1afb679d71b8c64dedd662 | |
| parent | 7c2bcce745314ab6feb56ece8749efd63c534fb1 (diff) | |
| parent | cf6534c269153f4dc5102cf095f6f7268f6d50ee (diff) | |
Merge "Add amsterdam stream to JJB templates"
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml | 4 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-lcm-python.yaml | 2 |
6 files changed, 13 insertions, 1 deletions
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index cc2c8650b..71941e82e 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' subproject: - 'drv-vnfm-huawei': diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml index a1af3b773..a53ec8cc5 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' subproject: - 'gvnfm-juju': diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml index a1a7d236d..ed262323b 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' build-node: ubuntu1604-basebuild-4c-4g subproject: diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml index 8698735ff..b6bf8321a 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' jobs: - '{project-name}-{stream}-docker-java-version-shell-daily': @@ -16,4 +18,4 @@ !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml index 79a392337..69804323d 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' build-node: ubuntu1604-basebuild-4c-4g subproject: diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml index 8fc3b9e1b..7662f8369 100644 --- a/jjb/vfc/vfc-nfvo-lcm-python.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'vfc-nfvo-lcm-settings' build-node: centos7-redis-4c-4g subproject: |