<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9683">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Corey Farrell: Looks good to me, but someone else must approve
Jenkins2: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Add options to initialize and cleanup database to runTestsuite.sh<br><br>Change-Id: I352333233bab5377723bf37d490ba84fc55bc853<br>---<br>M tests/CI/periodic-dailyTestGroups.json<br>M tests/CI/runTestsuite.sh<br>M tests/CI/setupRealtime.sh<br>M tests/CI/teardownRealtime.sh<br>4 files changed, 119 insertions(+), 57 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/CI/periodic-dailyTestGroups.json b/tests/CI/periodic-dailyTestGroups.json</span><br><span>index 01f51d1..9136032 100644</span><br><span>--- a/tests/CI/periodic-dailyTestGroups.json</span><br><span>+++ b/tests/CI/periodic-dailyTestGroups.json</span><br><span>@@ -32,7 +32,7 @@</span><br><span> {</span><br><span> "name": "real",</span><br><span> "dir": "tests/CI/output/realtime",</span><br><span style="color: hsl(0, 100%, 40%);">- "runTestsuiteOptions": "--realtime",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--realtime --initialize-db --cleanup-db",</span><br><span> "testcmd": " -t tests/channels/pjsip -G realtime-incompatible"</span><br><span> }</span><br><span> ]</span><br><span>diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh</span><br><span>index a8908d4..0778a2b 100755</span><br><span>--- a/tests/CI/runTestsuite.sh</span><br><span>+++ b/tests/CI/runTestsuite.sh</span><br><span>@@ -9,7 +9,7 @@</span><br><span> ./cleanup-test-remnants.sh</span><br><span> </span><br><span> if [ $REALTIME -eq 1 ] ; then</span><br><span style="color: hsl(0, 100%, 40%);">- $CIDIR/setupRealtime.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ $CIDIR/setupRealtime.sh --initialize-db=${INITIALIZE_DB:?0}</span><br><span> fi</span><br><span> </span><br><span> export PYTHONPATH=./lib/python/</span><br><span>@@ -17,7 +17,7 @@</span><br><span> ./runtests.py --cleanup ${TESTSUITE_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :</span><br><span> </span><br><span> if [ $REALTIME -eq 1 ] ; then</span><br><span style="color: hsl(0, 100%, 40%);">- $CIDIR/teardownRealtime.sh</span><br><span style="color: hsl(120, 100%, 40%);">+ $CIDIR/teardownRealtime.sh --cleanup-db=${CLEANUP_DB:?0}</span><br><span> fi</span><br><span> </span><br><span> if [ -f core* ] ; then</span><br><span>diff --git a/tests/CI/setupRealtime.sh b/tests/CI/setupRealtime.sh</span><br><span>index f599d33..49ffb8b 100755</span><br><span>--- a/tests/CI/setupRealtime.sh</span><br><span>+++ b/tests/CI/setupRealtime.sh</span><br><span>@@ -1,9 +1,114 @@</span><br><span> #!/usr/bin/env bash</span><br><span> CIDIR=$(dirname $(readlink -fn $0))</span><br><span style="color: hsl(120, 100%, 40%);">+INITIALIZE_DB=0</span><br><span> source $CIDIR/ci.functions</span><br><span style="color: hsl(120, 100%, 40%);">+ASTTOP=$(readlink -fn $CIDIR/../../)</span><br><span> </span><br><span> set -e</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+POSTGRES_PID=`pidof postgres || : `</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -z "$POSTGRES_PID" ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ -x /usr/local/bin/postgresql-start ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ /usr/local/bin/postgresql-start</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+POSTGRES_PID=`pidof postgres || : `</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -z "$POSTGRES_PID" ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Postgres isn't running. It must be started manually before this test can continue."</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if [ $INITIALIZE_DB -gt 0 ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "(re)Initializing Database"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo -u postgres dropdb -e asterisk_test >/dev/null 2>&1 || :</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo -u postgres dropuser -e asterisk_test >/dev/null 2>&1 || :</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo -u postgres createuser --username=postgres -RDIElS asterisk_test</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo -u postgres createdb --username=postgres -E UTF-8 -O asterisk_test asterisk_test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Configuring ODBC"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo odbcinst -u -d -n "PostgreSQL-Asterisk-Test"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo odbcinst -i -d -n "PostgreSQL-Asterisk-Test" -f /dev/stdin <<-EOF</span><br><span style="color: hsl(120, 100%, 40%);">+ [PostgreSQL-Asterisk-Test]</span><br><span style="color: hsl(120, 100%, 40%);">+ Description=PostgreSQL ODBC driver (Unicode version)</span><br><span style="color: hsl(120, 100%, 40%);">+ Driver=psqlodbcw.so</span><br><span style="color: hsl(120, 100%, 40%);">+ Setup=libodbcpsqlS.so</span><br><span style="color: hsl(120, 100%, 40%);">+ Debug=0</span><br><span style="color: hsl(120, 100%, 40%);">+ CommLog=1</span><br><span style="color: hsl(120, 100%, 40%);">+ UsageCount=1</span><br><span style="color: hsl(120, 100%, 40%);">+ EOF</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo odbcinst -u -s -l -n asterisk-connector-test</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo odbcinst -i -s -l -n asterisk-connector-test -f /dev/stdin <<-EOF</span><br><span style="color: hsl(120, 100%, 40%);">+ [asterisk-connector-test]</span><br><span style="color: hsl(120, 100%, 40%);">+ Description = PostgreSQL connection to 'asterisk' database</span><br><span style="color: hsl(120, 100%, 40%);">+ Driver = PostgreSQL-Asterisk-Test</span><br><span style="color: hsl(120, 100%, 40%);">+ Database = asterisk_test</span><br><span style="color: hsl(120, 100%, 40%);">+ Servername = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ UserName = asterisk_test</span><br><span style="color: hsl(120, 100%, 40%);">+ Port = 5432</span><br><span style="color: hsl(120, 100%, 40%);">+ Protocol = 9.1</span><br><span style="color: hsl(120, 100%, 40%);">+ ReadOnly = No</span><br><span style="color: hsl(120, 100%, 40%);">+ RowVersioning = No</span><br><span style="color: hsl(120, 100%, 40%);">+ ShowSystemTables = No</span><br><span style="color: hsl(120, 100%, 40%);">+ ShowOldColumn = No</span><br><span style="color: hsl(120, 100%, 40%);">+ FakeOldIndex = No</span><br><span style="color: hsl(120, 100%, 40%);">+ ConnSettings =</span><br><span style="color: hsl(120, 100%, 40%);">+ EOF</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cat >/tmp/config.ini <<-EOF</span><br><span style="color: hsl(120, 100%, 40%);">+ [alembic]</span><br><span style="color: hsl(120, 100%, 40%);">+ script_location = config</span><br><span style="color: hsl(120, 100%, 40%);">+ sqlalchemy.url = postgresql://asterisk_test@localhost/asterisk_test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [loggers]</span><br><span style="color: hsl(120, 100%, 40%);">+ keys = root,sqlalchemy,alembic</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [handlers]</span><br><span style="color: hsl(120, 100%, 40%);">+ keys = console</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [formatters]</span><br><span style="color: hsl(120, 100%, 40%);">+ keys = generic</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [logger_root]</span><br><span style="color: hsl(120, 100%, 40%);">+ level = WARN</span><br><span style="color: hsl(120, 100%, 40%);">+ handlers = console</span><br><span style="color: hsl(120, 100%, 40%);">+ qualname =</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [logger_sqlalchemy]</span><br><span style="color: hsl(120, 100%, 40%);">+ level = WARN</span><br><span style="color: hsl(120, 100%, 40%);">+ handlers =</span><br><span style="color: hsl(120, 100%, 40%);">+ qualname = sqlalchemy.engine</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [logger_alembic]</span><br><span style="color: hsl(120, 100%, 40%);">+ level = INFO</span><br><span style="color: hsl(120, 100%, 40%);">+ handlers =</span><br><span style="color: hsl(120, 100%, 40%);">+ qualname = alembic</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [handler_console]</span><br><span style="color: hsl(120, 100%, 40%);">+ class = StreamHandler</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (sys.stderr,)</span><br><span style="color: hsl(120, 100%, 40%);">+ level = NOTSET</span><br><span style="color: hsl(120, 100%, 40%);">+ formatter = generic</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [formatter_generic]</span><br><span style="color: hsl(120, 100%, 40%);">+ format = %(levelname)-5.5s [%(name)s] %(message)s</span><br><span style="color: hsl(120, 100%, 40%);">+ datefmt = %H:%M:%S</span><br><span style="color: hsl(120, 100%, 40%);">+EOF</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+pushd $ASTTOP/contrib/ast-db-manage</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+psql --username=asterisk_test --host=localhost --db=asterisk_test --command='DROP OWNED BY asterisk_test CASCADE'</span><br><span style="color: hsl(120, 100%, 40%);">+alembic -c /tmp/config.ini upgrade head</span><br><span style="color: hsl(120, 100%, 40%);">+rm -rf /tmp/config.ini || :</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+popd</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> cp test-config.yaml test-config.orig.yaml</span><br><span> </span><br><span> cat >test-config.yaml <<-EOF</span><br><span>@@ -65,59 +170,10 @@</span><br><span> config-section: realtime-config</span><br><span> </span><br><span> realtime-config:</span><br><span style="color: hsl(0, 100%, 40%);">- username: "asterisk"</span><br><span style="color: hsl(120, 100%, 40%);">+ username: "asterisk_test"</span><br><span style="color: hsl(120, 100%, 40%);">+ password: "asterisk_test"</span><br><span> host: "localhost"</span><br><span style="color: hsl(0, 100%, 40%);">- db: "asterisk"</span><br><span style="color: hsl(0, 100%, 40%);">- dsn: "asterisk-connector"</span><br><span style="color: hsl(120, 100%, 40%);">+ db: "asterisk_test"</span><br><span style="color: hsl(120, 100%, 40%);">+ dsn: "asterisk-connector-test"</span><br><span> EOF</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ASTTOP=$(readlink -fn $CIDIR/../../)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-cat >/tmp/config.ini <<-EOF</span><br><span style="color: hsl(0, 100%, 40%);">- [alembic]</span><br><span style="color: hsl(0, 100%, 40%);">- script_location = config</span><br><span style="color: hsl(0, 100%, 40%);">- sqlalchemy.url = postgresql://asterisk@localhost/asterisk</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- [loggers]</span><br><span style="color: hsl(0, 100%, 40%);">- keys = root,sqlalchemy,alembic</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- [handlers]</span><br><span style="color: hsl(0, 100%, 40%);">- keys = console</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- [formatters]</span><br><span style="color: hsl(0, 100%, 40%);">- keys = generic</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- [logger_root]</span><br><span style="color: hsl(0, 100%, 40%);">- level = WARN</span><br><span style="color: hsl(0, 100%, 40%);">- handlers = console</span><br><span style="color: hsl(0, 100%, 40%);">- qualname =</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- [logger_sqlalchemy]</span><br><span style="color: hsl(0, 100%, 40%);">- level = WARN</span><br><span style="color: hsl(0, 100%, 40%);">- handlers =</span><br><span style="color: hsl(0, 100%, 40%);">- qualname = sqlalchemy.engine</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- [logger_alembic]</span><br><span style="color: hsl(0, 100%, 40%);">- level = INFO</span><br><span style="color: hsl(0, 100%, 40%);">- handlers =</span><br><span style="color: hsl(0, 100%, 40%);">- qualname = alembic</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- [handler_console]</span><br><span style="color: hsl(0, 100%, 40%);">- class = StreamHandler</span><br><span style="color: hsl(0, 100%, 40%);">- args = (sys.stderr,)</span><br><span style="color: hsl(0, 100%, 40%);">- level = NOTSET</span><br><span style="color: hsl(0, 100%, 40%);">- formatter = generic</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- [formatter_generic]</span><br><span style="color: hsl(0, 100%, 40%);">- format = %(levelname)-5.5s [%(name)s] %(message)s</span><br><span style="color: hsl(0, 100%, 40%);">- datefmt = %H:%M:%S</span><br><span style="color: hsl(0, 100%, 40%);">-EOF</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-pushd $ASTTOP/contrib/ast-db-manage</span><br><span style="color: hsl(0, 100%, 40%);">-if [ -x /usr/local/bin/postgresql-start ] ; then</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/local/bin/postgresql-start</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-psql --username=asterisk --host=localhost --db=asterisk --command='DROP OWNED BY asterisk CASCADE'</span><br><span style="color: hsl(0, 100%, 40%);">-alembic -c /tmp/config.ini upgrade head</span><br><span style="color: hsl(0, 100%, 40%);">-rm -rf /tmp/config.ini || :</span><br><span style="color: hsl(0, 100%, 40%);">-popd</span><br><span>diff --git a/tests/CI/teardownRealtime.sh b/tests/CI/teardownRealtime.sh</span><br><span>index 1114699..8687706 100755</span><br><span>--- a/tests/CI/teardownRealtime.sh</span><br><span>+++ b/tests/CI/teardownRealtime.sh</span><br><span>@@ -1,6 +1,12 @@</span><br><span> #!/usr/bin/env bash</span><br><span> CIDIR=$(dirname $(readlink -fn $0))</span><br><span style="color: hsl(120, 100%, 40%);">+CLEANUP_DB=0</span><br><span> source $CIDIR/ci.functions</span><br><span> </span><br><span> cp test-config.orig.yaml test-config.yaml</span><br><span style="color: hsl(0, 100%, 40%);">-psql --username=asterisk --host=localhost --db=asterisk --command='DROP OWNED BY asterisk CASCADE'</span><br><span style="color: hsl(120, 100%, 40%);">+if [ $CLEANUP_DB -gt 0 ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo -u postgres dropdb -e asterisk_test >/dev/null 2>&1 || :</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo -u postgres dropuser -e asterisk_test >/dev/null 2>&1 || :</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo odbcinst -u -d -n "PostgreSQL-Asterisk-Test"</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo odbcinst -u -s -l -n "asterisk-connector-test"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9683">change 9683</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9683"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I352333233bab5377723bf37d490ba84fc55bc853 </div>
<div style="display:none"> Gerrit-Change-Number: 9683 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>