summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common.yml55
-rw-r--r--test/qa-tests/jstests/restore/24_to_28.js2
-rw-r--r--test/qa-tests/jstests/restore/26_to_28.js2
-rw-r--r--test/qa-tests/jstests/restore/28_to_26.js2
-rw-r--r--test/qa-tests/jstests/restore/conflicting_auth_schema_version.js2
-rw-r--r--test/qa-tests/jstests/restore/users_and_roles_26_to_28_to_26.js2
-rw-r--r--test/qa-tests/jstests/restore/users_and_roles_28_to_26.js2
-rw-r--r--test/qa-tests/jstests/restore/users_and_roles_full_dump.js2
8 files changed, 64 insertions, 5 deletions
diff --git a/common.yml b/common.yml
index 42850aa0d5b..f04ce42fb34 100644
--- a/common.yml
+++ b/common.yml
@@ -38,6 +38,13 @@ mongo_tools_variables:
mongo30_url: "http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-ubuntu1204-3.0.7.tgz"
mongo26_url: "http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-ubuntu1204-2.6.5.tgz"
mongo24_url: "http://downloads.10gen.com/linux/mongodb-linux-x86_64-subscription-ubuntu1204-2.4.12.tgz"
+ linux_ppc64le_bit_enterprise: &mongo_url_ubuntu1504_ppc64le_enterprise
+ mongo_os: "ubuntu1504"
+ mongo_url: "http://downloads.10gen.com/linux/mongodb-linux-ppc64le-enterprise-ubuntu1504-3.3.1.tgz"
+ mongo32_url: "http://downloads.10gen.com/linux/mongodb-linux-ppc64le-enterprise-ubuntu1504-3.3.1.tgz"
+ mongo30_url: "http://downloads.10gen.com/linux/mongodb-linux-ppc64le-enterprise-ubuntu1504-3.3.1.tgz"
+ mongo26_url: "http://downloads.10gen.com/linux/mongodb-linux-ppc64le-enterprise-ubuntu1504-3.3.1.tgz"
+ mongo24_url: "http://downloads.10gen.com/linux/mongodb-linux-ppc64le-enterprise-ubuntu1504-3.3.1.tgz"
windows_32_bit: &mongo_url_windows32
mongo_url: "https://fastdl.mongodb.org/win32/mongodb-win32-i386-latest.zip"
mongo32_url: "https://fastdl.mongodb.org/win32/mongodb-win32-i386-3.2.0.zip"
@@ -206,6 +213,26 @@ mongo_tools_variables:
distros:
- windows-64-vs2013-test
- name: unit
+ ubuntu1504_enterprise_task_list: &ubuntu1504_enterprise_tasks
+ - name: bsonutil
+ - name: db
+ - name: dist
+ - name: integration
+ - name: integration-auth
+ - name: json
+ #- name: kerberos
+ - name: lint
+ - name: log
+ - name: progress
+ - name: qa-dump-restore-archiving
+ - name: qa-dump-restore-gzip
+ - name: qa-tests
+ - name: qa-tests-unstable
+ - name: qa-tests-wt
+ - name: text
+ - name: unit
+ - name: util
+ - name: vet
## Common mongodb arguments
@@ -1064,7 +1091,7 @@ tasks:
python buildscripts/setup_multiversion_mongodb.py /data/install /data/multiversion ${arch} "2.6" "2.4" --latest ${smoke_use_ssl} --os="${mongo_os}" || true
chmod 400 jstests/libs/key*
- PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=core${resmoke_use_ssl} --continueOnFailure --log=buildlogger --reportFile=report.json
+ PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=core${resmoke_use_ssl} --continueOnFailure --log=buildlogger --reportFile=report.json ${resmoke_args}
- name: qa-tests
@@ -1126,7 +1153,7 @@ tasks:
python buildscripts/setup_multiversion_mongodb.py /data/install /data/multiversion ${arch} "2.6" "2.4" --latest ${smoke_use_ssl} --os="${mongo_os}" || true
chmod 400 jstests/libs/key*
- PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=core${resmoke_use_ssl} --continueOnFailure --log=buildlogger --reportFile=report.json
+ PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=core${resmoke_use_ssl} --continueOnFailure --log=buildlogger --reportFile=report.json ${resmoke_args}
- name: qa-dump-restore-archiving
depends_on:
@@ -1165,7 +1192,7 @@ tasks:
python buildscripts/setup_multiversion_mongodb.py /data/install /data/multiversion ${arch} "2.6" "2.4" --latest ${smoke_use_ssl} --os="${mongo_os}" || true
chmod 400 jstests/libs/key*
- PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=restore_archive --continueOnFailure --log=buildlogger --reportFile=report.json
+ PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=restore_archive --continueOnFailure --log=buildlogger --reportFile=report.json ${resmoke_args}
- name: qa-dump-restore-gzip
depends_on:
@@ -1204,7 +1231,7 @@ tasks:
python buildscripts/setup_multiversion_mongodb.py /data/install /data/multiversion ${arch} "2.6" "2.4" --latest ${smoke_use_ssl} --os="${mongo_os}" || true
chmod 400 jstests/libs/key*
- PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=restore_gzip --continueOnFailure --log=buildlogger --reportFile=report.json
+ PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=restore_gzip --continueOnFailure --log=buildlogger --reportFile=report.json ${resmoke_args}
- name: qa-tests-wt
depends_on:
@@ -1264,7 +1291,7 @@ tasks:
python buildscripts/setup_multiversion_mongodb.py /data/install /data/multiversion ${arch} "2.6" "2.4" --latest ${smoke_use_ssl} --os="${mongo_os}" || true
chmod 400 jstests/libs/key*
- PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=core --continueOnFailure --log=buildlogger --reportFile=report.json --storageEngine=wiredTiger
+ PATH=$PATH:/data/multiversion python buildscripts/resmoke.py --suite=core --continueOnFailure --log=buildlogger --reportFile=report.json --storageEngine=wiredTiger ${resmoke_args}
- name: text
commands:
@@ -1449,6 +1476,24 @@ buildvariants:
integration_test_args: integration
tasks: *ubuntu1204_enterprise_tasks
+- name: ubuntu-ppc64le-enterprise
+ display_name: Linux PPC64LE Enterprise
+ run_on:
+ - ubuntu-1504-power8-build
+ expansions:
+ <<: *mongo_url_ubuntu1504_ppc64le_enterprise
+ <<: *mongod_default_startup_args
+ <<: *mongo_default_startup_args
+ # Ubuntu 1504 does not include gcc 5.3 yet so SSL is disabled
+ #build_tags: -tags "ssl sasl"
+ #resmoke_use_ssl: _ssl
+ resmoke_args: --excludeWithAnyTags=requires_mongo_24,requires_mongo_26,requires_mongo_30
+ arch: "linux/ppc64le"
+ edition: enterprise
+ run_kinit: true
+ integration_test_args: integration
+ tasks: *ubuntu1504_enterprise_tasks
+
#######################################
# Solaris Buildvariant #
#######################################
diff --git a/test/qa-tests/jstests/restore/24_to_28.js b/test/qa-tests/jstests/restore/24_to_28.js
index 570da394c5f..d818b605393 100644
--- a/test/qa-tests/jstests/restore/24_to_28.js
+++ b/test/qa-tests/jstests/restore/24_to_28.js
@@ -1,3 +1,5 @@
+// This test requires mongo 2.4.x, and mongo 3.0.0 releases
+// @tags: [requires_mongo_24, requires_mongo_30]
(function() {
load("jstests/configs/standard_dump_targets.config.js");
diff --git a/test/qa-tests/jstests/restore/26_to_28.js b/test/qa-tests/jstests/restore/26_to_28.js
index f6194f804ef..4836e625c21 100644
--- a/test/qa-tests/jstests/restore/26_to_28.js
+++ b/test/qa-tests/jstests/restore/26_to_28.js
@@ -1,3 +1,5 @@
+// This test requires mongo 2.6.x, and mongo 3.0.0 releases
+// @tags: [requires_mongo_26, requires_mongo_30]
(function() {
load("jstests/configs/standard_dump_targets.config.js");
diff --git a/test/qa-tests/jstests/restore/28_to_26.js b/test/qa-tests/jstests/restore/28_to_26.js
index 1461ab02b47..a63862dc071 100644
--- a/test/qa-tests/jstests/restore/28_to_26.js
+++ b/test/qa-tests/jstests/restore/28_to_26.js
@@ -1,3 +1,5 @@
+// This test requires mongo 2.6.x, and mongo 3.0.0 releases
+// @tags: [requires_mongo_26, requires_mongo_30]
(function() {
diff --git a/test/qa-tests/jstests/restore/conflicting_auth_schema_version.js b/test/qa-tests/jstests/restore/conflicting_auth_schema_version.js
index 6582780b68a..6c3b293e37a 100644
--- a/test/qa-tests/jstests/restore/conflicting_auth_schema_version.js
+++ b/test/qa-tests/jstests/restore/conflicting_auth_schema_version.js
@@ -1,3 +1,5 @@
+// This test requires mongo 2.6.x releases
+// @tags: [requires_mongo_26]
(function() {
load("jstests/configs/standard_dump_targets.config.js");
diff --git a/test/qa-tests/jstests/restore/users_and_roles_26_to_28_to_26.js b/test/qa-tests/jstests/restore/users_and_roles_26_to_28_to_26.js
index 03bc94d03b7..c0c9f84de36 100644
--- a/test/qa-tests/jstests/restore/users_and_roles_26_to_28_to_26.js
+++ b/test/qa-tests/jstests/restore/users_and_roles_26_to_28_to_26.js
@@ -1,3 +1,5 @@
+// This test requires mongo 2.6.x, and mongo 3.0.0 releases
+// @tags: [requires_mongo_26, requires_mongo_30]
(function() {
load("jstests/configs/standard_dump_targets.config.js");
diff --git a/test/qa-tests/jstests/restore/users_and_roles_28_to_26.js b/test/qa-tests/jstests/restore/users_and_roles_28_to_26.js
index c278ab877c2..165054f0387 100644
--- a/test/qa-tests/jstests/restore/users_and_roles_28_to_26.js
+++ b/test/qa-tests/jstests/restore/users_and_roles_28_to_26.js
@@ -1,3 +1,5 @@
+// This test requires mongo 2.6.x, and mongo 3.0.0 releases
+// @tags: [requires_mongo_26, requires_mongo_30]
(function() {
load("jstests/configs/standard_dump_targets.config.js");
diff --git a/test/qa-tests/jstests/restore/users_and_roles_full_dump.js b/test/qa-tests/jstests/restore/users_and_roles_full_dump.js
index de38fd9f6ee..c8321faa4c2 100644
--- a/test/qa-tests/jstests/restore/users_and_roles_full_dump.js
+++ b/test/qa-tests/jstests/restore/users_and_roles_full_dump.js
@@ -1,3 +1,5 @@
+// This test requires mongo 2.6.x releases
+// @tags: [requires_mongo_26]
(function() {
// Tests running mongorestore with --restoreDbUsersAndRoles against
View Lorry Controller Status