Skip to content

Commit

Permalink
Update CI build scripts to use older nodejs for the UI tests.
Browse files Browse the repository at this point in the history
The Centos 7 builds use the software collections feature to run the
UI tests with nodejs 6.

The Rocky 8 builds download node 10 and use this for the UI tests.
  • Loading branch information
jpwhite4 committed Mar 29, 2023
1 parent cf5f1ea commit 0ed3973
Showing 1 changed file with 19 additions and 15 deletions.
34 changes: 19 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ jobs:
- run:
name: install the composer dependencies
command: composer install
- run:
name: update nodejs version
command: |
dnf module -y reset nodejs
dnf module -y install nodejs:16
- restore_cache:
keys:
# "composer.lock" can be used if it is committed to the repo
Expand Down Expand Up @@ -118,18 +123,12 @@ jobs:
- run: ./tests/component/runtests.sh --junit-output-dir ~/phpunit
- when:
condition:
equal: [ *centos7-executor, << parameters.os >> ]
steps:
- 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
- when:
condition:
equal: [ *centos7-1000-executor, << parameters.os >> ]
or:
- equal: [ *centos7-executor, << parameters.os >> ]
- equal: [ *centos7-1000-executor, << parameters.os >> ]
steps:
- run: yum install -y centos-release-scl
- run: yum install -y rh-nodejs6
- run: scl enable rh-nodejs6 "./tests/ui/runtests.sh --headless --log-junit ~/phpunit"
- run:
name: 'Run SSO Tests'
Expand All @@ -143,13 +142,18 @@ jobs:
- 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: 'Bodge the nodejs version to run an older one for the webdriver tests'
command: |
curl https://nodejs.org/dist/v10.24.1/node-v10.24.1-linux-x64.tar.xz | tar -xJC /usr/local
chown root:root -R /usr/local/node-v10.24.1-linux-x64
- run: pushd ./tests/ui && PATH=/usr/local/node-v10.24.1-linux-x64/bin:$PATH /usr/local/node-v10.24.1-linux-x64/bin/npm install && popd
- run: PATH=/usr/local/node-v10.24.1-linux-x64/bin:$PATH ./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
PATH=/usr/local/node-v10.24.1-linux-x64/bin:$PATH ./tests/ci/samlSetup.sh
PATH=/usr/local/node-v10.24.1-linux-x64/bin:$PATH ./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
Expand Down

0 comments on commit 0ed3973

Please sign in to comment.