diff --git a/.circleci/config.yml b/.circleci/config.yml index a16da18817..231ef5838c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -127,7 +127,7 @@ jobs: - equal: [ *centos7-executor, << parameters.os >> ] - equal: [ *centos7-1000-executor, << parameters.os >> ] steps: - - run: yum install -y rh-nodejs6 + - run: yum install -y centos-release-scl rh-nodejs6 - run: scl enable rh-nodejs6 "./tests/ui/runtests.sh --headless --log-junit ~/phpunit" - run: name: 'Run SSO Tests' @@ -135,20 +135,6 @@ jobs: scl enable rh-nodejs6 "./tests/ci/samlSetup.sh" scl enable rh-nodejs6 "./tests/ui/runtests.sh --headless --log-junit ~/phpunit --sso" ./vendor/phpunit/phpunit/phpunit -c ./tests/integration/phpunit.xml.dist --testsuite sso --log-junit ~/phpunit/xdmod-sso-integration.xml - - when: - condition: - or: - - equal: [ *rocky8-executor, << parameters.os >> ] - steps: - - run: pushd $HOME && rm -f chromedriver_linux64.zip && wget https://chromedriver.storage.googleapis.com/106.0.5249.61/chromedriver_linux64.zip && popd - - run: pushd ./tests/ui && npm install && popd - - run: ./tests/ui/runtests.sh --headless --log-junit ~/phpunit - - run: - name: 'Run SSO Tests' - command: | - ./tests/ci/samlSetup.sh - ./tests/ui/runtests.sh --headless --log-junit ~/phpunit --sso - ./vendor/phpunit/phpunit/phpunit -c ./tests/integration/phpunit.xml.dist --testsuite sso --log-junit ~/phpunit/xdmod-sso-integration.xml - run: name: Ensure that no unexpected Apache errors were generated command: test `fgrep -v ' [ssl:warn] ' /var/log/xdmod/apache-error.log | wc -l` = 0