David Caro has uploaded a new change for review.
Change subject: Added 3.5 from 3.4 db upgrade
......................................................................
Added 3.5 from 3.4 db upgrade
It replaces ovirt_engine_3.4_update_db_to_3.5_gerrit
Change-Id: I52035443b48a025916f04ef087ae7c8949e41d76
Signed-off-by: David Caro <dcaro...@redhat.com>
---
M jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh
M jobs/confs/yaml/jobs/ovirt-engine/ovirt-engine_upgrade-db.yaml
2 files changed, 36 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/49/35649/1
diff --git a/jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh
b/jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh
index a713c37..109d723 100644
--- a/jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh
+++ b/jobs/confs/shell-scripts/ovirt-engine_upgrade-db.sh
@@ -48,6 +48,13 @@
|| :
sudo -u postgres \
+ psql \
+ -d template1 \
+ -c "ALTER USER engine CREATEDB" \
+&>/dev/null \
+|| :
+
+sudo -u postgres \
dropdb engine \
&>/dev/null \
|| :
@@ -66,10 +73,17 @@
# make sure we have user and access
echo "INFO::POPULATING DATABASE"
-./packaging/dbscripts/schema.sh \
- -c apply \
- -u engine \
- -d "$DBNAME"
+if [[ -e ./packaging/dbscripts/schema.sh ]]; then
+ ./packaging/dbscripts/schema.sh \
+ -c apply \
+ -u engine \
+ -d "$DBNAME"
+else
+ echo "WARN:Using old script create_db.sh, make sure this is from <3.5"
+ ./packaging/dbscripts/create_db.sh \
+ -u engine \
+ -d "$DBNAME"
+fi
echo "INFO::DATABASE POPULATED"
### upgrade ####
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 1d35266..a1d1efd 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
@@ -20,3 +20,21 @@
- from
jobs:
- 'ovirt-engine_{version}_upgrade-db-{action}-{test-version}_{trigger}'
+
+- project:
+ name: ovirt-engine_upgrade-db_3.5
+ project:
+ - ovirt-engine
+ trigger:
+ - merged
+ - created
+ version:
+ - 3.5:
+ branch: 'ovirt-engine-3.5'
+ test-version:
+ - 3.4:
+ test-branch: 'ovirt-engine-3.4'
+ action:
+ - from
+ jobs:
+ - 'ovirt-engine_{version}_upgrade-db-{action}-{test-version}_{trigger}'
--
To view, visit http://gerrit.ovirt.org/35649
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52035443b48a025916f04ef087ae7c8949e41d76
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: David Caro <dcaro...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
