diff --git a/Jenkinsfile b/Jenkinsfile index ff2aaff47..afa02be10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -82,6 +82,12 @@ def executeTests() { . ${HOME}/environment.txt set +o allexport + # Fix Java version at Java8 for now because of dependencies in DSE. + # TODO: This should last us through testing against Cassandra 4.1.x at least but + # will eventually need to be made more generic. + . ${JABBA_SHELL} + jabba use 1.8 + npm run ci_jenkins ''' } @@ -302,6 +308,7 @@ pipeline { SIMULACRON_PATH = '/home/jenkins/simulacron.jar' CCM_PATH = '/home/jenkins/ccm' CCM_ENVIRONMENT_SHELL = '/usr/local/bin/ccm_environment.sh' + JABBA_SHELL = '/usr/lib/jabba/jabba.sh' } stages { diff --git a/ci/appveyor.yml b/ci/appveyor.yml index 46d8c17f4..1c892f6ea 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -2,11 +2,9 @@ environment: appveyor_build_worker_cloud: gce ci_type: ci_unit_appveyor matrix: - - nodejs_version: 8 - - nodejs_version: 10 - CCM_VERSION: 3.11.4 - ci_type: ci_appveyor - - nodejs_version: 12 + - nodejs_version: 16 + - nodejs_version: 18 + - nodejs_version: 20 image: Visual Studio 2017 platform: - x64 diff --git a/package.json b/package.json index ec3040e38..1f5f3f2da 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,8 @@ "integration_short": "./node_modules/.bin/mocha test/integration/short -R spec -t 5000 --recursive", "integration_long": "./node_modules/.bin/mocha test/integration/long -R spec -t 5000 --recursive", "ci_jenkins": "./node_modules/.bin/mocha test/unit test/integration/short --recursive -R mocha-jenkins-reporter --exit", - "ci_appveyor": "./node_modules/.bin/mocha test/unit test/integration/short --recursive -R mocha-appveyor-reporter --exit", - "ci_unit_appveyor": "./node_modules/.bin/mocha test/unit --recursive -R mocha-appveyor-reporter --exit", + "ci_appveyor": ".\\\"node_modules/.bin/mocha\" test/unit test/integration/short --recursive -R mocha-appveyor-reporter --exit", + "ci_unit_appveyor": ".\\\"node_modules/.bin/mocha\" test/unit --recursive -R mocha-appveyor-reporter --exit", "server_api": "./node_modules/.bin/mocha test/integration/short -g '@SERVER_API' --recursive --exit", "eslint": "eslint lib test" },