David Caro has uploaded a new change for review.
Change subject: Adding some delay to let the db start up on slow systems
......................................................................
Adding some delay to let the db start up on slow systems
Change-Id: I01534d7a059d46653e90bb7c3c981bf432a24865
Signed-off-by: David Caro <dcaro...@redhat.com>
---
M jobs/ovirt_engine_upgrade_params/update_engine_params.sh
1 file changed, 45 insertions(+), 42 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/40/31240/1
diff --git a/jobs/ovirt_engine_upgrade_params/update_engine_params.sh
b/jobs/ovirt_engine_upgrade_params/update_engine_params.sh
index ec2057c..639ef4a 100644
--- a/jobs/ovirt_engine_upgrade_params/update_engine_params.sh
+++ b/jobs/ovirt_engine_upgrade_params/update_engine_params.sh
@@ -26,70 +26,73 @@
init_postgres()
{
local res=0
- if rpm -q postgresql-server; then
- service postgresql stop
- yum remove -y postgresql-server
- fi
- ## rm -rf does not complain if the file does not exist
- rm -rf /var/lib/pgsql/data
- yum -y install postgresql-server
- postgresql-setup initdb || res=$(($res + $?))
- ## ugly fig for the tests to work
- cat >/var/lib/pgsql/data/pg_hba.conf <<EOF
+ if rpm -q postgresql-server; then
+ service postgresql stop
+ yum remove -y postgresql-server
+ fi
+ ## rm -rf does not complain if the file does not exist
+ rm -rf /var/lib/pgsql/data
+ yum -y install postgresql-server
+ postgresql-setup initdb || res=$(($res + $?))
+ ## ugly fig for the tests to work
+ cat >/var/lib/pgsql/data/pg_hba.conf <<EOF
host all all 127.0.0.1/0 trust
host all all ::1/128 trust
local all all trust
EOF
- cat /var/lib/pgsql/data/pg_hba.conf
- service postgresql start || res=$(($res + $?))
- psql -h 127.0.0.1 postgres postgres \
- -c "CREATE USER engine WITH PASSWORD '123456';" \
+ cat /var/lib/pgsql/data/pg_hba.conf
+ service postgresql start || res=$(($res + $?))
+ # Wait a few seconds to give time for the database to start up on
+ # slow systems
+ wait 30
+ psql -h 127.0.0.1 postgres postgres \
+ -c "CREATE USER engine WITH PASSWORD '123456';" \
|| res=$(($res + $?))
- psql -h 127.0.0.1 postgres postgres \
- -c "CREATE DATABASE engine;" \
+ psql -h 127.0.0.1 postgres postgres \
+ -c "CREATE DATABASE engine;" \
|| res=$(($res + $?))
- psql -h 127.0.0.1 postgres postgres \
- -c "GRANT ALL PRIVILEGES ON DATABASE engine TO engine;" \
+ psql -h 127.0.0.1 postgres postgres \
+ -c "GRANT ALL PRIVILEGES ON DATABASE engine TO engine;" \
|| res=$(($res + $?))
- if [[ "${res}" -ne 0 ]]; then
- echo "Failed to init postgres"
- exit 1
- fi
+ if [[ "${res}" -ne 0 ]]; then
+ echo "Failed to init postgres"
+ exit 1
+ fi
}
pre_clean()
{
- echo "----- Cleaning old rpms... ----"
- sed -i "s/CHANGE_HOSTNAME/$HOSTNAME/g" "${CLEANUP_FILE}"
- # Clean engine rpms
- if rpm -q ovirt-engine; then
- engine-cleanup -u \
- || engine-cleanup --config-append="${CLEANUP_FILE}"
- fi
- yum -y remove ovirt-engine\* vdsm\* httpd mod_ssl
- rm -rf /etc/httpd/*
- rm -f "${WORKSPACE}"/*log "${WORKSPACE}"/*txt
- echo "" > /etc/exports
- rm -rf /var/lib/exports/iso
+ echo "----- Cleaning old rpms... ----"
+ sed -i "s/CHANGE_HOSTNAME/$HOSTNAME/g" "${CLEANUP_FILE}"
+ # Clean engine rpms
+ if rpm -q ovirt-engine; then
+ engine-cleanup -u \
+ || engine-cleanup --config-append="${CLEANUP_FILE}"
+ fi
+ yum -y remove ovirt-engine\* vdsm\* httpd mod_ssl
+ rm -rf /etc/httpd/*
+ rm -f "${WORKSPACE}"/*log "${WORKSPACE}"/*txt
+ echo "" > /etc/exports
+ rm -rf /var/lib/exports/iso
}
disable_engine_repos()
{
- for repo in /etc/yum.repos.d/*; do
- grep -qi ovirt "$repo" \
- && sed -i 's/enabled=1/enabled=0/g' "$repo"
- done
+ for repo in /etc/yum.repos.d/*; do
+ grep -qi ovirt "$repo" \
+ && sed -i 's/enabled=1/enabled=0/g' "$repo"
+ done
}
enable_engine_repos()
{
- for repo in /etc/yum.repos.d/*; do
- grep -qi ovirt "$repo" \
- sed -i 's/enabled=0/enabled=1/g' "$repo"
- done
+ for repo in /etc/yum.repos.d/*; do
+ grep -qi ovirt "$repo" \
+ sed -i 's/enabled=0/enabled=1/g' "$repo"
+ done
}
--
To view, visit http://gerrit.ovirt.org/31240
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01534d7a059d46653e90bb7c3c981bf432a24865
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
