diff options
author | Kevin Jacobs <kjacobs@mozilla.com> | 2019-08-27 14:45:43 +0000 |
---|---|---|
committer | Kevin Jacobs <kjacobs@mozilla.com> | 2019-08-27 14:45:43 +0000 |
commit | fad0b868c28af863b0379cf58cefa46ca2d8209c (patch) | |
tree | dfd9bce866af173ba52033e3ae79cdf7169b5168 /automation/taskcluster | |
parent | b3575fc9f17248996c115bcfa3b94e37d650f928 (diff) | |
download | nss-hg-fad0b868c28af863b0379cf58cefa46ca2d8209c.tar.gz |
Bug 1485533 - Close gaps in taskcluster SSL testing. r=mtNSS_3_46_BETA2
This patch increases SSL testing on taskcluster, specifically, running an additional 395 tests on each SSL cycle (more for FIPS targets), and adding a new 'stress' cycle.
Notable changes:
1) This patch removes SSL stress tests from the default `NSS_SSL_RUN` list in all.sh and ssl.sh. If stress tests are needed, this variable must be set to include.
2) The "normal_normal" case is added to `NSS_SSL_TESTS` for all targets. FIPS targets also run "normal_fips", "fips_normal", and "fips_fips".
3) `--enable-libpkix` is now set for all taskcluster "build.sh" builds in order to support a number of OCSP tests that were previously not run.
Differential Revision: https://phabricator.services.mozilla.com/D43283
Diffstat (limited to 'automation/taskcluster')
-rw-r--r-- | automation/taskcluster/graph/src/extend.js | 26 | ||||
-rwxr-xr-x | automation/taskcluster/scripts/build_gyp.sh | 2 | ||||
-rw-r--r-- | automation/taskcluster/windows/build_gyp.sh | 2 |
3 files changed, 22 insertions, 8 deletions
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js index 890a00fd4..1c5c35c05 100644 --- a/automation/taskcluster/graph/src/extend.js +++ b/automation/taskcluster/graph/src/extend.js @@ -121,12 +121,22 @@ queue.map(task => { } } - // We don't run FIPS SSL tests if (task.tests == "ssl") { if (!task.env) { task.env = {}; } - task.env.NSS_SSL_TESTS = "crl iopr policy"; + + // Stress tests to not include other SSL tests + if (task.symbol == "stress") { + task.env.NSS_SSL_TESTS = "normal_normal"; + } else { + task.env.NSS_SSL_TESTS = "crl iopr policy normal_normal"; + } + + // FIPS runs + if (task.collection == "fips") { + task.env.NSS_SSL_TESTS += " fips_fips fips_normal normal_fips"; + } if (task.platform == "mac") { task.maxRunTime = 7200; @@ -574,7 +584,7 @@ async function scheduleFuzzing() { "/bin/bash", "-c", "bin/checkout.sh && " + - "nss/automation/taskcluster/scripts/build_gyp.sh -g -v --fuzz" + "nss/automation/taskcluster/scripts/build_gyp.sh --fuzz" ], artifacts: { public: { @@ -601,7 +611,7 @@ async function scheduleFuzzing() { "/bin/bash", "-c", "bin/checkout.sh && " + - "nss/automation/taskcluster/scripts/build_gyp.sh -g -v --fuzz=tls" + "nss/automation/taskcluster/scripts/build_gyp.sh --fuzz=tls" ], })); @@ -679,7 +689,7 @@ async function scheduleFuzzing32() { "/bin/bash", "-c", "bin/checkout.sh && " + - "nss/automation/taskcluster/scripts/build_gyp.sh -g -v --fuzz -t ia32" + "nss/automation/taskcluster/scripts/build_gyp.sh --fuzz -t ia32" ], artifacts: { public: { @@ -706,7 +716,7 @@ async function scheduleFuzzing32() { "/bin/bash", "-c", "bin/checkout.sh && " + - "nss/automation/taskcluster/scripts/build_gyp.sh -g -v --fuzz=tls -t ia32" + "nss/automation/taskcluster/scripts/build_gyp.sh --fuzz=tls -t ia32" ], })); @@ -958,6 +968,10 @@ function scheduleTests(task_build, task_cert, test_base) { queue.scheduleTask(merge(ssl_base, { name: "SSL tests (upgradedb)", symbol: "upgradedb", cycle: "upgradedb" })); + queue.scheduleTask(merge(ssl_base, { + name: "SSL tests (stress)", symbol: "stress", cycle: "sharedb", + env: {NSS_SSL_RUN: "stress"} + })); } /*****************************************************************************/ diff --git a/automation/taskcluster/scripts/build_gyp.sh b/automation/taskcluster/scripts/build_gyp.sh index fb3a33a52..d5a3fbdd9 100755 --- a/automation/taskcluster/scripts/build_gyp.sh +++ b/automation/taskcluster/scripts/build_gyp.sh @@ -6,7 +6,7 @@ source $(dirname "$0")/tools.sh hg_clone https://hg.mozilla.org/projects/nspr ./nspr default # Build. -nss/build.sh -g -v "$@" +nss/build.sh -g -v --enable-libpkix "$@" # Package. if [[ $(uname) = "Darwin" ]]; then diff --git a/automation/taskcluster/windows/build_gyp.sh b/automation/taskcluster/windows/build_gyp.sh index c0f38f948..94433ee45 100644 --- a/automation/taskcluster/windows/build_gyp.sh +++ b/automation/taskcluster/windows/build_gyp.sh @@ -32,7 +32,7 @@ export PATH="${PATH}:${PWD}/ninja/bin:${PWD}/gyp/test-env/Scripts" hg_clone https://hg.mozilla.org/projects/nspr nspr default # Build with gyp. -./nss/build.sh -g -v "$@" +./nss/build.sh -g -v --enable-libpkix "$@" # Package. 7z a public/build/dist.7z dist |