Restore amsterdam build job for demo repo

ETE Robot suites in amsterdam still have dependencies
on staging artifacts, which have disappeared from the
staging repos.  Restore the amsterdam jobs so that
we can re-create these artifacts and release them.

Also remove obsolete release-1.0.0 jobs.

Change-Id: If7afb3be03b11c17c8908ec40ed8afeebd77d0d6
Issue-ID: INT-406
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 1560589..0eb89c8 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -13,8 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
+      - 'amsterdam':
+          branch: 'amsterdam'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index 3687e98..d5875a2 100644 (file)
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -15,6 +15,4 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'testsuite-python-testing-utils-settings'