Merge pull request ceph#19600 from liewegas/wip-mimic-trusty-backports

qa: mimic-dev1 backports to avoid trusty nodes
LeoHubery · Dec 20, 2017 · cd31bf9 · cd31bf9
2 parents 6446303 + eb330c5
commit cd31bf9
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 267 deletions.
diff --git a/qa/distros/supported/ubuntu_14.04.yaml b/qa/distros/supported/ubuntu_14.04.yaml
diff --git a/...asic_functional/tasks/libcephfs_java.yaml → .../tasks/libcephfs_java/libcephfs_java.yaml b/...asic_functional/tasks/libcephfs_java.yaml → .../tasks/libcephfs_java/libcephfs_java.yaml
@@ -1,7 +1,3 @@
-
-os_type: ubuntu
-os_version: "14.04"
-
 overrides:
   ceph-fuse:
     disabled: true

diff --git a/qa/suites/fs/basic_functional/tasks/libcephfs_java/ubuntu_latest.yaml b/qa/suites/fs/basic_functional/tasks/libcephfs_java/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../../distros/supported/ubuntu_latest.yaml
diff --git a/qa/suites/fs/multiclient/distros/ubuntu_latest.yaml b/qa/suites/fs/multiclient/distros/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../distros/supported/ubuntu_latest.yaml
diff --git a/qa/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled b/qa/suites/fs/multiclient/tasks/fsx-mpi.yaml.disabled
@@ -1,7 +1,4 @@
 # make sure we get the same MPI version on all hosts
-os_type: ubuntu
-os_version: "14.04"
-
 tasks:
 - pexec:
     clients:

diff --git a/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml b/qa/suites/fs/multiclient/tasks/ior-shared-file.yaml
@@ -1,7 +1,4 @@
 # make sure we get the same MPI version on all hosts
-os_type: ubuntu
-os_version: "14.04"
-
 tasks:
 - pexec:
     clients:

diff --git a/qa/suites/fs/multiclient/tasks/mdtest.yaml b/qa/suites/fs/multiclient/tasks/mdtest.yaml
@@ -1,7 +1,4 @@
 # make sure we get the same MPI version on all hosts
-os_type: ubuntu
-os_version: "14.04"
-
 tasks:
 - pexec:
     clients:

diff --git a/qa/suites/hadoop/basic/clusters/fixed-3.yaml b/qa/suites/hadoop/basic/clusters/fixed-3.yaml
@@ -1,7 +1,3 @@
-
-os_type: ubuntu
-os_version: "14.04"
-
 overrides:
   ceph:
     conf:

diff --git a/qa/suites/hadoop/basic/distros/ubuntu_latest.yaml b/qa/suites/hadoop/basic/distros/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../distros/supported/ubuntu_latest.yaml
diff --git a/qa/tasks/tests/test_buildpackages.py b/qa/tasks/tests/test_buildpackages.py
diff --git a/src/test/centos-6/Dockerfile.in b/src/test/centos-6/Dockerfile.in
diff --git a/src/test/centos-6/ceph.spec.in b/src/test/centos-6/ceph.spec.in
diff --git a/src/test/docker-test-helper.sh b/src/test/docker-test-helper.sh
@@ -153,8 +153,8 @@ $0 [options] command args ...
 
    [--os-type type]       docker image repository (centos, ubuntu, etc.) 
                           (defaults to ubuntu)
-   [--os-version version] docker image tag (7 for centos, 12.04 for ubuntu, etc.)
-                          (defaults to 14.04)
+   [--os-version version] docker image tag (7 for centos, 16.04 for ubuntu, etc.)
+                          (defaults to 16.04)
    [--ref gitref]         git reset --hard gitref before running the command
                           (defaults to git rev-parse HEAD)
    [--all types+versions] list of docker image repositories and tags
@@ -171,7 +171,7 @@ continues. Here is a sample use case including an interactive session
 and running a unit test:
 
    $ lsb_release -d
-   Description:	Ubuntu Trusty Tahr (development branch)
+   Description:	Ubuntu Xenial Xerus (development branch)
    $ test/docker-test.sh --os-type centos --os-version 7 --shell
    HEAD is now at 1caee81 autotools: add --enable-docker
    bash-4.2$ pwd
@@ -202,21 +202,20 @@ and running a unit test:
 The --all argument is a bash associative array literal listing the
 operating system version for each operating system type. For instance
 
-   docker-test.sh --all '([ubuntu]="12.04 14.04" [centos]="6 7")' 
+   docker-test.sh --all '([ubuntu]="16.04 17.04" [centos]="7")' 
 
 is strictly equivalent to
 
-   docker-test.sh --os-type ubuntu --os-version 12.04
-   docker-test.sh --os-type ubuntu --os-version 14.04
-   docker-test.sh --os-type centos --os-version 6
+   docker-test.sh --os-type ubuntu --os-version 16.04
+   docker-test.sh --os-type ubuntu --os-version 17.04
    docker-test.sh --os-type centos --os-version 7
 
 The --os-type and --os-version must be exactly as displayed by docker images:
 
    $ docker images
    REPOSITORY            TAG                 IMAGE ID          ...
    centos                7                   87e5b6b3ccc1      ...
-   ubuntu                14.04               6b4e8a7373fe      ...
+   ubuntu                16.04               6b4e8a7373fe      ...
 
 The --os-type value can be any string in the REPOSITORY column, the --os-version
 can be any string in the TAG column.
@@ -232,8 +231,8 @@ docker-test.sh --ref giant -- make check
 Run an interactive shell and set resolv.conf to use 172.17.42.1
 docker-test.sh --opts --dns=172.17.42.1 --shell
 
-Run make check on centos 6, centos 7, ubuntu 12.04 and ubuntu 14.04
-docker-test.sh --all '([ubuntu]="12.04 14.04" [centos]="6 7")' -- make check
+Run make check on centos 7, ubuntu 16.04 and ubuntu 17.04
+docker-test.sh --all '([ubuntu]="16.04 17.04" [centos]="7")' -- make check
 EOF
 }
 
@@ -249,7 +248,7 @@ function main_docker() {
     eval set -- "$temp"
 
     local os_type=ubuntu
-    local os_version=14.04
+    local os_version=16.04
     local all
     local remove=false
     local shell=false

diff --git a/src/test/ubuntu-12.04/Dockerfile.in b/src/test/ubuntu-12.04/Dockerfile.in
diff --git a/src/test/ubuntu-12.04/debian b/src/test/ubuntu-12.04/debian
diff --git a/src/test/ubuntu-12.04/install-deps.sh b/src/test/ubuntu-12.04/install-deps.sh
diff --git a/src/test/ubuntu-14.04/debian b/src/test/ubuntu-14.04/debian
diff --git a/src/test/ubuntu-14.04/install-deps.sh b/src/test/ubuntu-14.04/install-deps.sh
diff --git a/src/test/ubuntu-14.04/Dockerfile.in → src/test/ubuntu-17.04/Dockerfile.in b/src/test/ubuntu-14.04/Dockerfile.in → src/test/ubuntu-17.04/Dockerfile.in
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014, 2015 Red Hat <[email protected]>
+# Copyright (C) 2016 Red Hat <[email protected]>
 #
 # Author: Loic Dachary <[email protected]>
 #
@@ -27,5 +27,5 @@ RUN apt-get update
 # build dependencies
 RUN cd /root ; ./install-deps.sh
 # development tools
-RUN apt-get install -y ccache valgrind gdb python-virtualenv gdisk kpartx jq xmlstarlet
+RUN apt-get install -y ccache valgrind gdb python-virtualenv gdisk kpartx jq xmlstarlet sudo
 RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi
diff --git a/src/test/ubuntu-17.04/debian b/src/test/ubuntu-17.04/debian
@@ -0,0 +1 @@
+../../../debian/
diff --git a/src/test/centos-6/install-deps.sh → src/test/ubuntu-17.04/install-deps.sh b/src/test/centos-6/install-deps.sh → src/test/ubuntu-17.04/install-deps.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../../distros/supported/ubuntu_latest.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../distros/supported/ubuntu_latest.yaml