<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9450">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins2: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: Add realtime checks to dailies<br><br>Change-Id: I6dc8ab1679b3505c6dde1d47e1b9276df47814f8<br>---<br>M tests/CI/periodic-dailyTestGroups.json<br>M tests/CI/periodics-daily.jenkinsfile<br>M tests/CI/runTestsuite.sh<br>A tests/CI/setupRealtime.sh<br>4 files changed, 135 insertions(+), 1 deletion(-)<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 b8c8e9b..01f51d1 100644</span><br><span>--- a/tests/CI/periodic-dailyTestGroups.json</span><br><span>+++ b/tests/CI/periodic-dailyTestGroups.json</span><br><span>@@ -28,5 +28,11 @@</span><br><span> "name": "othr",</span><br><span> "dir": "tests/CI/output/other",</span><br><span> "testcmd": " -T tests/(apps|agi|blind-transfer-parkingtimeout|rest_api|channels|realtime|example|skeleton_test|remote-test)"</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ "name": "real",</span><br><span style="color: hsl(120, 100%, 40%);">+ "dir": "tests/CI/output/realtime",</span><br><span style="color: hsl(120, 100%, 40%);">+ "runTestsuiteOptions": "--realtime",</span><br><span style="color: hsl(120, 100%, 40%);">+ "testcmd": " -t tests/channels/pjsip -G realtime-incompatible"</span><br><span> }</span><br><span> ]</span><br><span>diff --git a/tests/CI/periodics-daily.jenkinsfile b/tests/CI/periodics-daily.jenkinsfile</span><br><span>index fd9fa6b..c879040 100644</span><br><span>--- a/tests/CI/periodics-daily.jenkinsfile</span><br><span>+++ b/tests/CI/periodics-daily.jenkinsfile</span><br><span>@@ -65,6 +65,7 @@</span><br><span> def groupName = testGroup.name</span><br><span> def groupDir = testGroup.dir</span><br><span> def groupTestcmd = testGroup.testcmd</span><br><span style="color: hsl(120, 100%, 40%);">+ def groupRunTestsuiteOptions = testGroup.runTestsuiteOptions</span><br><span> def testsuiteUrl = env.GIT_URL.replaceAll(/\/(Security-)?[^\/]+$/, "/\$1testsuite")</span><br><span> </span><br><span> parallelTasks[groupName] = {</span><br><span>@@ -92,7 +93,7 @@</span><br><span> userRemoteConfigs: [[url: testsuiteUrl]]</span><br><span> ]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sh "sudo tests/CI/runTestsuite.sh --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"</span><br><span style="color: hsl(120, 100%, 40%);">+ sh "sudo tests/CI/runTestsuite.sh ${groupRunTestsuiteOptions} --testsuite-dir='${groupDir}' --test-command='${groupTestcmd}'"</span><br><span> </span><br><span> archiveArtifacts allowEmptyArchive: true, defaultExcludes: false, fingerprint: true,</span><br><span> artifacts: "${groupDir}/asterisk-test-suite-report.xml, ${groupDir}/logs/**, ${groupDir}/core*.txt"</span><br><span>diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh</span><br><span>index d295421..35f4d58 100755</span><br><span>--- a/tests/CI/runTestsuite.sh</span><br><span>+++ b/tests/CI/runTestsuite.sh</span><br><span>@@ -1,11 +1,17 @@</span><br><span> #!/usr/bin/env bash</span><br><span> CIDIR=$(dirname $(readlink -fn $0))</span><br><span style="color: hsl(120, 100%, 40%);">+REALTIME=0</span><br><span> source $CIDIR/ci.functions</span><br><span> ASTETCDIR=$DESTDIR/etc/asterisk</span><br><span> </span><br><span> pushd $TESTSUITE_DIR</span><br><span> </span><br><span> ./cleanup-test-remnants.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if [ $REALTIME -eq 0 ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ $CIDIR/setupRealtime.sh</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> export PYTHONPATH=./lib/python/</span><br><span> echo "Running tests ${TEST_COMMAND}"</span><br><span> ./runtests.py --cleanup ${TEST_COMMAND} | contrib/scripts/pretty_print --no-color --no-timer --term-width=120 --show-errors || :</span><br><span>diff --git a/tests/CI/setupRealtime.sh b/tests/CI/setupRealtime.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..01593a1</span><br><span>--- /dev/null</span><br><span>+++ b/tests/CI/setupRealtime.sh</span><br><span>@@ -0,0 +1,121 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env bash</span><br><span style="color: hsl(120, 100%, 40%);">+CIDIR=$(dirname $(readlink -fn $0))</span><br><span style="color: hsl(120, 100%, 40%);">+source $CIDIR/ci.functions</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cat >test-config.yaml <<EOF</span><br><span style="color: hsl(120, 100%, 40%);">+ global-settings:</span><br><span style="color: hsl(120, 100%, 40%);">+ test-configuration: config-realtime</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ condition-definitions:</span><br><span style="color: hsl(120, 100%, 40%);">+ -</span><br><span style="color: hsl(120, 100%, 40%);">+ name: 'threads'</span><br><span style="color: hsl(120, 100%, 40%);">+ pre:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'thread_test_condition.ThreadPreTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ post:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'thread_test_condition.ThreadPostTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ related-type: 'thread_test_condition.ThreadPreTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ -</span><br><span style="color: hsl(120, 100%, 40%);">+ name: 'sip-dialogs'</span><br><span style="color: hsl(120, 100%, 40%);">+ pre:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'sip_dialog_test_condition.SipDialogPreTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ post:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'sip_dialog_test_condition.SipDialogPostTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ -</span><br><span style="color: hsl(120, 100%, 40%);">+ name: 'locks'</span><br><span style="color: hsl(120, 100%, 40%);">+ pre:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'lock_test_condition.LockTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ post:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'lock_test_condition.LockTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ -</span><br><span style="color: hsl(120, 100%, 40%);">+ name: 'file-descriptors'</span><br><span style="color: hsl(120, 100%, 40%);">+ pre:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'fd_test_condition.FdPreTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ post:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'fd_test_condition.FdPostTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ related-type: 'fd_test_condition.FdPreTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ -</span><br><span style="color: hsl(120, 100%, 40%);">+ name: 'channels'</span><br><span style="color: hsl(120, 100%, 40%);">+ pre:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'channel_test_condition.ChannelTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ post:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'channel_test_condition.ChannelTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ -</span><br><span style="color: hsl(120, 100%, 40%);">+ name: 'sip-channels'</span><br><span style="color: hsl(120, 100%, 40%);">+ pre:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'sip_channel_test_condition.SipChannelTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ post:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'sip_channel_test_condition.SipChannelTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ -</span><br><span style="color: hsl(120, 100%, 40%);">+ name: 'memory'</span><br><span style="color: hsl(120, 100%, 40%);">+ pre:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'memory_test_condition.MemoryPreTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ post:</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: 'memory_test_condition.MemoryPostTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+ related-type: 'memory_test_condition.MemoryPreTestCondition'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ config-realtime:</span><br><span style="color: hsl(120, 100%, 40%);">+ test-modules:</span><br><span style="color: hsl(120, 100%, 40%);">+ modules:</span><br><span style="color: hsl(120, 100%, 40%);">+ -</span><br><span style="color: hsl(120, 100%, 40%);">+ typename: realtime_converter.RealtimeConverter</span><br><span style="color: hsl(120, 100%, 40%);">+ config-section: realtime-config</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ realtime-config:</span><br><span style="color: hsl(120, 100%, 40%);">+ username: "asterisk"</span><br><span style="color: hsl(120, 100%, 40%);">+ host: "localhost"</span><br><span style="color: hsl(120, 100%, 40%);">+ db: "asterisk"</span><br><span style="color: hsl(120, 100%, 40%);">+ dsn: "asterisk-connector"</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%);">+ASTTOP=$(readlink -fn $CIDIR/../../)</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@localhost/asterisk</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%);">+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%);">+psql --username=asterisk --host=localhost --db=asterisk --command='DROP OWNED BY asterisk 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%);">+popd</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9450">change 9450</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/9450"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6dc8ab1679b3505c6dde1d47e1b9276df47814f8 </div>
<div style="display:none"> Gerrit-Change-Number: 9450 </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: Jenkins2 </div>