Merge "Adding support to use golang jenkins plugin"

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/include-docker-push.sh b/jjb/include-docker-push.sh
index c0394de..cd88f9d 100755 (executable)
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -17,8 +17,8 @@ fi
 
 RELEASE_VERSION_REGEX="^[0-9]+\.[0-9]+\.[0-9]+$";
 
-SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP};
-STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP};
+SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP}Z;
+STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP}Z;
 
 
 # Set REPO_PATH variable

diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
new file mode 100644 (file)
index 0000000..9c1a558
--- /dev/null
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+     name: optf-osdf-csit
+     jobs:
+       - '{project-name}-{stream}-verify-csit-{functionality}'
+       - '{project-name}-{stream}-csit-{functionality}'
+     project-name: 'optf-osdf'
+     stream: 'master'
+     functionality:
+       - 'osdf':
+           trigger_jobs:
+             - 'optf-osdf-master-osdf-docker-java-version-shell-daily'
+     robot-options: ''
+     branch: 'master'

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'