Add tagging jobs to create git tags on trellis repos
Fix email address used to push tags
Change-Id: I2be5361ee66d3a589e4c1f8f0f39c0e0b19e6f26
diff --git a/jjb/repos/tost-onos.yaml b/jjb/repos/tost-onos.yaml
index 9ee0a4c..3475736 100644
--- a/jjb/repos/tost-onos.yaml
+++ b/jjb/repos/tost-onos.yaml
@@ -9,6 +9,9 @@
- 'verify-tost-onos-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-tost-onos-jobs':
+ branch-regexp: '{supported-branches-regexp}'
+
- job-group:
name: 'verify-tost-onos-jobs'
jobs:
@@ -18,3 +21,8 @@
- 'make-test':
make-test-targets: 'docker-build'
junit-allow-empty-results: true
+
+- job-group:
+ name: 'publish-tost-onos-jobs'
+ jobs:
+ - 'version-tag'
diff --git a/jjb/repos/trellis-control.yaml b/jjb/repos/trellis-control.yaml
index 3ad64c4..766fe9c 100644
--- a/jjb/repos/trellis-control.yaml
+++ b/jjb/repos/trellis-control.yaml
@@ -6,14 +6,22 @@
project: '{name}'
jobs:
- - 'trellis-control-jobs':
+ - 'verify-trellis-control-jobs':
branch-regexp: '^(.*)$'
junit-allow-empty-results: true
+ - 'publish-trellis-control-jobs':
+ branch-regexp: '^(.*)$'
+
- job-group:
- name: 'trellis-control-jobs'
+ name: 'verify-trellis-control-jobs'
jobs:
- 'verify-licensed'
- 'tag-check'
- 'maven-test'
+
+- job-group:
+ name: 'publish-trellis-control-jobs'
+ jobs:
+ - 'version-tag'
- 'maven-publish'
diff --git a/jjb/repos/trellis-t3.yaml b/jjb/repos/trellis-t3.yaml
index 03a0b98..71e7ca1 100644
--- a/jjb/repos/trellis-t3.yaml
+++ b/jjb/repos/trellis-t3.yaml
@@ -10,10 +10,18 @@
branch-regexp: '^(.*)$'
junit-allow-empty-results: true
+ - 'publish-trellis-t3-jobs':
+ branch-regexp: '^(.*)$'
+
- job-group:
name: 'trellis-t3-jobs'
jobs:
- 'verify-licensed'
- 'tag-check'
- 'maven-test'
+
+- job-group:
+ name: 'publish-trellis-t3-jobs'
+ jobs:
+ - 'version-tag'
- 'maven-publish'
diff --git a/jjb/shell/version-tag.sh b/jjb/shell/version-tag.sh
index 393b3bc..4037943 100755
--- a/jjb/shell/version-tag.sh
+++ b/jjb/shell/version-tag.sh
@@ -150,10 +150,10 @@
echo "Creating git tag: $NEW_VERSION"
git checkout "$GERRIT_PATCHSET_REVISION"
- git config --global user.email "do-not-reply@opencord.org"
+ git config --global user.email "do-not-reply@onlab.us"
git config --global user.name "Jenkins"
- git tag -a "$NEW_VERSION" -m "Tagged by CORD Jenkins version-tag job: $BUILD_NUMBER, for Gerrit patchset: $GERRIT_CHANGE_NUMBER"
+ git tag -a "$NEW_VERSION" -m "Tagged by ONOS Jenkins version-tag job: $BUILD_NUMBER, for Gerrit patchset: $GERRIT_CHANGE_NUMBER"
echo "Tags including new tag:"
git tag -n