@@ -504,7 +504,15 @@ jobs:
504504 sudo apt-get update
505505 sudo apt-get install --yes --no-install-recommends postgresql-client
506506 if [ "${{ matrix.registry }}" = "test/registry" ]; then
507- sudo apt-get install --yes --no-install-recommends nginx
507+ sudo apt-get install -y curl gnupg2 ca-certificates lsb-release ubuntu-keyring
508+ curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
509+ | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
510+ gpg --dry-run --quiet --no-keyring --import --import-options import-show /usr/share/keyrings/nginx-archive-keyring.gpg
511+ echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
512+ http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" \
513+ | sudo tee /etc/apt/sources.list.d/nginx.list
514+ sudo apt-get update
515+ sudo apt-get install nginx
508516 sudo nginx -c $(pwd)/test/tcp/reverse-proxy/nginx/elegant-sni-proxy.conf
509517 fi
510518
@@ -513,6 +521,7 @@ jobs:
513521 pip3 install -r cicd/requirements.txt
514522
515523 - name : Generate rewritten registry for simulations
524+ if : ${{ matrix.registry }} != 'test/registry'
516525 run : |
517526 python3 test/python/registry-rewrite.py
518527
@@ -525,28 +534,37 @@ jobs:
525534 - name : Run robot mocked functional tests
526535 if : success()
527536 run : |
528- python cicd/python/build.py --robot-test --config='{ "variables": { "SHOULD_RUN_DOCKER_EXTERNAL_TESTS": "true", "SUNDRY_CONFIG": "${{ env.SUNDRY_CONFIG }}" } }'
537+ if [ "${{ matrix.registry }}" = "test/registry" ]; then
538+ robot \
539+ --variable "SUNDRY_CONFIG:${{ env.SUNDRY_CONFIG }}" \
540+ --variable SHOULD_RUN_DOCKER_EXTERNAL_TESTS:true \
541+ --include tls_proxied \
542+ -d test/robot/reports test/robot/functional
543+ test/robot/registry-mocked
544+ else
545+ python cicd/python/build.py --robot-test --config='{ "variables": { "SHOULD_RUN_DOCKER_EXTERNAL_TESTS": "true", "SUNDRY_CONFIG": "${{ env.SUNDRY_CONFIG }}" } }'
546+ fi
529547
530548 - name : Output from mocked functional tests
531549 if : always()
532550 run : |
533551 cat ./test/robot/reports/output.xml
534552
535553 - name : Run robot mocked functional tests with aggressive concurrency
536- if : success()
554+ if : success() && ${{ matrix.registry }} != 'test/registry'
537555 run : |
538556 echo "## Stray flask apps to be killed before robot tests ##"
539557 pgrep -f flask | xargs kill -9 || true
540558 echo "## End ##"
541559 python cicd/python/build.py --robot-test --config='{ "variables": { "SHOULD_RUN_DOCKER_EXTERNAL_TESTS": "true", "CONCURRENCY_LIMIT": -1 } }'
542560
543561 - name : Output from mocked functional tests with aggressive concurrency
544- if : always()
562+ if : always() && ${{ matrix.registry }} != 'test/registry'
545563 run : |
546564 cat ./test/robot/reports/output.xml
547565
548566 - name : Run robot integration tests
549- if : env.AZURE_CLIENT_SECRET != '' && startsWith(env.STATE_SOURCE_TAG, 'build-release')
567+ if : env.AZURE_CLIENT_SECRET != '' && startsWith(env.STATE_SOURCE_TAG, 'build-release') && ${{ matrix.registry }} != 'test/registry'
550568 env :
551569 AZURE_CLIENT_ID : ${{ secrets.AZURE_CLIENT_ID }}
552570 AZURE_CLIENT_SECRET : ${{ secrets.AZURE_CLIENT_SECRET }}
@@ -559,16 +577,17 @@ jobs:
559577 python cicd/python/build.py --robot-test-integration
560578
561579 - name : Prepare Test DB
562- if : success()
580+ if : success() && ${{ matrix.registry }} != 'test/registry'
563581 run : cp test/db/db.sqlite test/db/tmp/python-tests-tmp-db.sqlite
564582
565583 - name : Test Script
566- if : success()
584+ if : success() && ${{ matrix.registry }} != 'test/registry'
567585 run : python3 "${TESTSCRIPT}"
568586 env :
569587 TESTSCRIPT : ${{env.TESTSCRIPT}}
570588
571589 - name : install and test deb package
590+ if : ${{ matrix.registry }} != 'test/registry'
572591 run : |
573592 mkdir -p deb_test
574593 cp stackql_${{env.BUILDMAJORVERSION}}.${{env.BUILDMINORVERSION}}.${{env.BUILDPATCHVERSION}}_amd64.deb deb_test/
@@ -584,7 +603,7 @@ jobs:
584603 echo "stackql version: ${stackqlVersion}"
585604
586605 - name : Output from mocked deb package functional tests
587- if : always()
606+ if : always() && ${{ matrix.registry }} != 'test/registry'
588607 run : |
589608 cat ./test/robot/reports/output.xml
590609
0 commit comments