Merge pull request #12616 from romeroalx/update-gh-actions-auth-to-4.7

Backport GH Actions updates from master to auth-4.7.x
PowerDNS · Mar 8, 2023 · 3e176ba · 3e176ba
2 parents 6514655 + c9d1550
commit 3e176ba
Show file tree

Hide file tree

Showing 10 changed files with 260 additions and 243 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -563,109 +563,6 @@ jobs:
           paths:
             - pdns-auth
 
-  test-auth-regress-odbc-sqlite3:
-    resource_class: small
-
-    docker:
-      - image: debian:buster
-        auth:
-          username: powerdnsreadonly
-          password: $DOCKERHUB_PASSWORD
-        environment:
-          UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
-          ASAN_OPTIONS: detect_leaks=0
-    steps:
-      - auth-regress-setup
-      - run:
-          name: Configure ODBC for sqlite
-          command: |
-            cat >> ~/.odbc.ini \<<- __EOF__
-            [pdns-sqlite3-1]
-            Driver = SQLite3
-            Database = ${PWD}/regression-tests/pdns.sqlite3
-            [pdns-sqlite3-2]
-            Driver = SQLite3
-            Database = ${PWD}/regression-tests/pdns.sqlite32
-            __EOF__
-      - run:
-          name: Install ODBC deps
-          command: |
-            apt-get install -qq -y \
-            unixodbc \
-            libsqliteodbc
-      - run:
-          name: Set up sqlite3 odbc testing
-          command: echo 'export GODBC_SQLITE3_DSN=pdns-sqlite3-1' > ./vars
-          workdir: ~/project/regression-tests
-      - auth-regress:
-          context: godbc_sqlite3-nsec3
-          doroot: false # Broken at the moment
-
-  test-auth-regress-odbc-mssql:
-    docker:
-      - image: debian:buster
-        auth:
-          username: powerdnsreadonly
-          password: $DOCKERHUB_PASSWORD
-        environment:
-          UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
-          ASAN_OPTIONS: detect_leaks=0
-      - image: mcr.microsoft.com/mssql/server:2017-GA-ubuntu
-        environment:
-          - ACCEPT_EULA: Y
-          - SA_PASSWORD: 'SAsa12%%'
-    steps:
-      - auth-regress-setup
-      - run:
-          name: Install ODBC deps
-          command: |
-            apt-get install -qq -y \
-            freetds-bin \
-            tdsodbc \
-            unixodbc
-      - run:
-          name: set up mssql odbc
-          command: |
-            cat >> ~/.odbc.ini \<<- __EOF__
-            [pdns-mssql-docker]
-            Driver=FreeTDS
-            Trace=No
-            Server=127.0.0.1
-            Port=1433
-            Database=pdns
-            TDS_Version=7.1
-            [pdns-mssql-docker-nodb]
-            Driver=FreeTDS
-            Trace=No
-            Server=127.0.0.1
-            Port=1433
-            TDS_Version=7.1
-            __EOF__
-      - run:
-          command: cat /usr/share/tdsodbc/odbcinst.ini <(echo Threading=1) >> /etc/odbcinst.ini
-      - run:
-          name: create database
-          command: echo 'create database pdns' | isql -v pdns-mssql-docker-nodb sa SAsa12%%
-      - run:
-          name: Set up mssql odbc testing
-          command: echo 'export GODBC_MSSQL_PASSWORD=SAsa12%% GODBC_MSSQL_USERNAME=sa GODBC_MSSQL_DSN=pdns-mssql-docker' > ./vars
-          workdir: ~/project/regression-tests
-      - auth-regress:
-          context: godbc_mssql-nodnssec
-          skip: 8bit-txt-unescaped
-      - auth-regress:
-          context: godbc_mssql
-          skip: 8bit-txt-unescaped
-      - auth-regress:
-          context: godbc_mssql-nsec3
-          skip: 8bit-txt-unescaped
-      - auth-regress:
-          context: godbc_mssql-nsec3-optout
-          skip: 8bit-txt-unescaped
-      - auth-regress:
-          context: godbc_mssql-nsec3-narrow
-          skip: 8bit-txt-unescaped
-
   test-auth-regress-bind:
     resource_class: small
 
@@ -704,57 +601,6 @@ jobs:
       - auth-regress:
           context: bind-hybrid-nsec3
 
-  test-auth-regress-ldap:
-    resource_class: small
-
-    docker:
-      - image: debian:buster
-        auth:
-          username: powerdnsreadonly
-          password: $DOCKERHUB_PASSWORD
-        environment:
-          LDAPHOST: ldap://ldapserver/
-          UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
-          ASAN_OPTIONS: detect_leaks=0
-      - image: powerdns/ldap-regress:1.2.4-1 # OpenLDAP 2.4.47
-        auth:
-          username: powerdnsreadonly
-          password: $DOCKERHUB_PASSWORD
-        name: ldapserver
-        command: '--loglevel debug'
-        environment:
-          LDAP_LOG_LEVEL: 0
-    steps:
-      - auth-regress-setup
-      - run: DEBIAN_FRONTEND=noninteractive apt-get install -qq -y ldap-utils
-      - auth-regress:
-          context: ldap-tree
-          doroot: false
-      - auth-regress:
-          context: ldap-simple
-          doroot: false
-      - auth-regress:
-          context: ldap-strict
-          doroot: false
-
-  test-auth-regress-geoip:
-    resource_class: small
-
-    docker:
-      - image: debian:buster
-        auth:
-          username: powerdnsreadonly
-          password: $DOCKERHUB_PASSWORD
-        environment:
-          UBSAN_OPTIONS: 'print_stacktrace=1:halt_on_error=1'
-          ASAN_OPTIONS: detect_leaks=0
-    steps:
-      - auth-regress-setup
-      - run: export geoipdatabase=../modules/geoipbackend/regression-tests/GeoLiteCity.mmdb
-      - auth-regress:
-          context: geoip
-          doroot: false
-
   build-auth-docs:
     resource_class: small
 
@@ -1054,16 +900,3 @@ workflows:
       - build-auth:
           requires:
             - checkout
-      - test-auth-regress-odbc-sqlite3:
-          requires:
-            - build-auth
-      - test-auth-regress-odbc-mssql:
-          requires:
-            - build-auth
-      - test-auth-regress-geoip:
-          requires:
-            - build-auth
-      - test-auth-regress-ldap:
-          requires:
-            - build-auth
-