David Caro has uploaded a new change for review. Change subject: Adding upgrade db jobs on patch created ......................................................................
Adding upgrade db jobs on patch created Also fixing a few issues with the triggering filter expression and whitelist script fix Change-Id: Iea8d002ca8ea7aa8157ee52edcacc6f6c17056b5 Signed-off-by: David Caro <[email protected]> --- M jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh M jobs/confs/shell-scripts/whitelist-filter.sh M jobs/confs/yaml/jobs/ovirt-engine/ovirt-engine_upgrade-db.yaml M jobs/confs/yaml/templates/engine-upgrade-db.yaml 4 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/26/34926/1 diff --git a/jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh b/jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh index b34bb97..4c8661e 100644 --- a/jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh +++ b/jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh @@ -17,6 +17,9 @@ cd "$WORKSPACE"/ovirt-engine +### Make sure we have all the remote info up to date +git fetch --all --tags + ### get current HEAD ### cur_head="$(git rev-parse HEAD)" diff --git a/jobs/confs/shell-scripts/whitelist-filter.sh b/jobs/confs/shell-scripts/whitelist-filter.sh index 8f6589f..4b9bb38 100644 --- a/jobs/confs/shell-scripts/whitelist-filter.sh +++ b/jobs/confs/shell-scripts/whitelist-filter.sh @@ -6,7 +6,7 @@ # Check whitelist if ! [[ -z "$GERRIT_PATCHSET_UPLOADER_EMAIL" ]] \ - && [[ "@redhat.com" != "${{GERRIT_PATCHSET_UPLOADER_EMAIL: -11}}" ]] \ + && [[ "@redhat.com" != "${GERRIT_PATCHSET_UPLOADER_EMAIL: -11}" ]] \ && ! egrep -q \ -e "^$GERRIT_PATCHSET_UPLOADER_EMAIL\$" \ jenkins-whitelist/jenkins-whitelist.txt; then diff --git a/jobs/confs/yaml/jobs/ovirt-engine/ovirt-engine_upgrade-db.yaml b/jobs/confs/yaml/jobs/ovirt-engine/ovirt-engine_upgrade-db.yaml index 9579031..45d56e9 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine/ovirt-engine_upgrade-db.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine/ovirt-engine_upgrade-db.yaml @@ -7,6 +7,7 @@ - ovirt-engine trigger: - merged + - created version: - master: branch: 'master' diff --git a/jobs/confs/yaml/templates/engine-upgrade-db.yaml b/jobs/confs/yaml/templates/engine-upgrade-db.yaml index 3036702..ee38720 100644 --- a/jobs/confs/yaml/templates/engine-upgrade-db.yaml +++ b/jobs/confs/yaml/templates/engine-upgrade-db.yaml @@ -38,7 +38,7 @@ - on-patch-{trigger}-with-files-whitelist: project: 'ovirt-engine' branch: '{branch}' - files: '.*/packaging/dbscripts/.*' + files: '(.*/)?packaging/dbscripts/.*' builders: - whitelist - ovirt-engine_upgrade-db: -- To view, visit http://gerrit.ovirt.org/34926 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea8d002ca8ea7aa8157ee52edcacc6f6c17056b5 Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: David Caro <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
