Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1274350 - Update docker image, try to fix Valgrind/MemLeak tests …
…r=me
  • Loading branch information
Tim Taubert committed May 25, 2016
1 parent 6d658c6 commit fbf69eb
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 66 deletions.
4 changes: 2 additions & 2 deletions .taskcluster.yml
Expand Up @@ -64,14 +64,14 @@ tasks:
- "tc-treeherder.nss.{{revision_hash}}"

payload:
image: "ttaubert/nss-ci:0.0.13"
image: "ttaubert/nss-ci:0.0.14"

env:
TC_OWNER: {{owner}}
TC_SOURCE: {{{source}}}
TC_REVISION: '{{revision}}'
TC_REVISION_HASH: '{{revision_hash}}'
TC_DOCKER_IMAGE: "ttaubert/nss-ci:0.0.13"
TC_DOCKER_IMAGE: "ttaubert/nss-ci:0.0.14"
TC_PROVISIONER_ID: "aws-provisioner-v1"
TC_WORKER_TYPE: "hg-worker"
NSS_HEAD_REPOSITORY: '{{{url}}}'
Expand Down
6 changes: 5 additions & 1 deletion automation/taskcluster/docker/bin/checkout.sh
Expand Up @@ -7,5 +7,9 @@ if [ $(id -u) = 0 ]; then
exec su worker $0
fi

# Default values for testing.
REVISION=${NSS_HEAD_REVISION:-default}
REPOSITORY=${NSS_HEAD_REPOSITORY:-https://hg.mozilla.org/projects/nss}

# Clone NSS.
hg clone -r $NSS_HEAD_REVISION $NSS_HEAD_REPOSITORY nss
hg clone -r $REVISION $REPOSITORY nss
1 change: 1 addition & 0 deletions automation/taskcluster/docker/setup.sh
Expand Up @@ -9,6 +9,7 @@ apt_packages+=('curl')
apt_packages+=('mercurial')
apt_packages+=('npm')
apt_packages+=('git')
apt_packages+=('valgrind')
apt_packages+=('zlib1g-dev')

# 32-bit builds
Expand Down
2 changes: 1 addition & 1 deletion automation/taskcluster/graph/build.js
Expand Up @@ -77,7 +77,7 @@ function build_task(id, def) {

// Fill in attributes.
task.metadata.name = def.name;
task.metadata.description = def.description;
task.metadata.description = def.name;
task.payload.command = def.command;
task.payload.env = def.env || {};
task.extra.treeherder = merge.recursive(true, task.extra.treeherder, def.treeherder || {});
Expand Down
102 changes: 40 additions & 62 deletions automation/taskcluster/graph/graph.yml
Expand Up @@ -2,8 +2,6 @@ templates:
## Base Definitions #########################################################

builder:
name: "NSS"
description: "Build NSS & NSPR"
artifact: "dist.tar.bz2"
command:
- "/bin/bash"
Expand Down Expand Up @@ -39,8 +37,6 @@ templates:
- "bin/checkout.sh && nss/automation/taskcluster/scripts/run_tests.sh"

memleak:
name: "memleak tests"
description: "MemLeak tests"
extends: test_runner
env:
NSS_TESTS: "memleak"
Expand All @@ -51,44 +47,39 @@ templates:
## Test Definitions #########################################################

cert:
name: "cert tests"
description: "Cert tests"
name: "Cert tests"
extends: test_runner
env:
NSS_TESTS: "cert"
treeherder:
symbol: Ce
symbol: Cert

chains:
name: "chains tests"
description: "Chains tests"
name: "Chains tests"
extends: test_runner
env:
NSS_TESTS: "chains"
treeherder:
symbol: Ch
symbol: Chains

cipher:
name: "cipher tests"
description: "Cipher tests"
name: "Cipher tests"
extends: test_runner
env:
NSS_TESTS: "cipher"
treeherder:
symbol: Ci
symbol: Cipher

crmf:
name: "crmf tests"
description: "CRMF tests"
name: "CRMF tests"
extends: test_runner
env:
NSS_TESTS: "crmf"
treeherder:
symbol: CRMF

dbtests:
name: "dbtests"
description: "DBTests"
name: "DB tests"
extends: test_runner
env:
NSS_TESTS: "dbtests"
Expand All @@ -97,7 +88,6 @@ templates:

ec:
name: "EC tests"
description: "EC tests"
extends: test_runner
env:
NSS_TESTS: "ec"
Expand All @@ -106,7 +96,6 @@ templates:

fips:
name: "FIPS tests"
description: "FIPS tests"
extends: test_runner
env:
NSS_TESTS: "fips"
Expand All @@ -115,7 +104,6 @@ templates:

gtests:
name: "GTests"
description: "GTests"
extends: test_runner
env:
NSS_TESTS: "ssl_gtests gtests"
Expand All @@ -124,7 +112,6 @@ templates:

libpkix:
name: "libpkix tests"
description: "libpkix tests"
extends: test_runner
env:
NSS_TESTS: "libpkix"
Expand All @@ -133,93 +120,86 @@ templates:

lowhash:
name: "lowhash tests"
description: "lowhash tests"
extends: test_runner
env:
NSS_TESTS: "lowhash"
treeherder:
symbol: Lh
symbol: Lowhash

memleak_srv:
name: "memleak tests (ssl_server)"
memleak_server:
name: "MemLeak tests (ssl_server)"
extends: memleak
env:
NSS_MEMLEAK_TESTS: "ssl_server"
treeherder:
symbol: srv
symbol: server

memleak_clnt:
name: "memleak tests (ssl_client)"
memleak_client:
name: "MemLeak tests (ssl_client)"
extends: memleak
env:
NSS_MEMLEAK_TESTS: "ssl_client"
treeherder:
symbol: clnt
symbol: client

memleak_chains:
name: "memleak tests (chains)"
name: "MemLeak tests (chains)"
extends: memleak
env:
NSS_MEMLEAK_TESTS: "chains"
treeherder:
symbol: ch
symbol: chains

memleak_ocsp:
name: "memleak tests (ocsp)"
name: "MemLeak tests (ocsp)"
extends: memleak
env:
NSS_MEMLEAK_TESTS: "ocsp"
treeherder:
symbol: ocsp

merge:
name: "merge tests"
description: "Merge tests"
name: "Merge tests"
extends: test_runner
env:
NSS_TESTS: "merge"
treeherder:
symbol: Merge

ocsp:
name: "ocsp tests"
description: "OCSP tests"
name: "OCSP tests"
extends: test_runner
env:
NSS_TESTS: "ocsp"
treeherder:
symbol: OCSP

pkits:
name: "pkits tests"
description: "NIST PKITS tests"
name: "NIST PKITS tests"
extends: test_runner
env:
NSS_TESTS: "pkits"
treeherder:
symbol: PKITS

sdr:
name: "sdr tests"
description: "SDR tests"
name: "SDR tests"
extends: test_runner
env:
NSS_TESTS: "sdr"
treeherder:
symbol: SDR

smime:
name: "smime tests"
description: "S/MIME tests"
name: "S/MIME tests"
extends: test_runner
env:
NSS_TESTS: "smime"
treeherder:
symbol: SMIME

ssl: # Update this when TLS v1.3 doesn't fail these anymore.
name: "ssl tests"
description: "SSL tests"
name: "SSL tests"
artifact: "dist.tar.bz2"
command:
- "/bin/bash"
Expand All @@ -232,43 +212,42 @@ templates:
groupSymbol: SSL
groupName: SSL tests
subtasks:
ssl_std: true
ssl_standard: true
ssl_pkix: true
ssl_udb: true
ssl_sdb: true
ssl_upgradedb: true
ssl_sharedb: true

ssl_std:
name: "SSL tests (cycle=standard)"
ssl_standard:
name: "SSL tests (standard)"
extends: test_runner
env:
NSS_CYCLES: "standard"
treeherder:
symbol: "std"
symbol: "standard"
ssl_pkix:
name: "SSL tests (cycle=pkix)"
name: "SSL tests (pkix)"
extends: test_runner
env:
NSS_CYCLES: "pkix"
treeherder:
symbol: "pkix"
ssl_udb:
name: "SSL tests (cycle=upgradedb)"
ssl_upgradedb:
name: "SSL tests (upgradedb)"
extends: test_runner
env:
NSS_CYCLES: "upgradedb"
treeherder:
symbol: "udb"
ssl_sdb:
name: "SSL tests (cycle=sharedb)"
symbol: "upgradedb"
ssl_sharedb:
name: "SSL tests (sharedb)"
extends: test_runner
env:
NSS_CYCLES: "sharedb"
treeherder:
symbol: "sdb"
symbol: "sharedb"

tools:
name: "tools tests"
description: "Tools tests"
name: "Tools tests"
extends: test_runner
env:
NSS_TESTS: "tools"
Expand Down Expand Up @@ -307,8 +286,8 @@ graph:
collection:
debug: true
subtasks:
memleak_srv: true
memleak_clnt: true
memleak_server: true
memleak_client: true
memleak_chains: true
memleak_ocsp: true

Expand Down Expand Up @@ -372,7 +351,6 @@ graph:

clang-format:
name: "clang-format-3.8"
description: "Validate source code formatting"
command:
- "/bin/bash"
- "-c"
Expand Down

0 comments on commit fbf69eb

Please sign in to comment.