summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Kunz <georg.kunz@ericsson.com>2018-09-20 10:56:28 +0200
committerGeorg Kunz <georg.kunz@ericsson.com>2018-09-24 15:01:57 +0000
commitf5d09071d5109d9dab5c9938cf8be563e80f0b31 (patch)
tree893996363337b3a15c8953bd1f7e060bd5c5f924
parent07fb1d6385bfaf93ca50b3dba74658e84ea3cdd8 (diff)
Updating the container tags of the test projects
Setting the container versions of the test tools to a specific release tag. Change-Id: I3422be006ff80035cecc9ec22eba50b02ed97be6 Signed-off-by: Georg Kunz <georg.kunz@ericsson.com> (cherry picked from commit a5f91fbd49474a88d6a9c92e9da36d2cf20804ac)
-rw-r--r--docs/release/release-notes/index.rst34
-rw-r--r--docs/testing/user/userguide/testing_guide.rst55
-rw-r--r--etc/conf/bottlenecks_config.yml2
-rw-r--r--etc/conf/functest_config.yml2
-rw-r--r--etc/conf/yardstick_config.yml2
5 files changed, 47 insertions, 48 deletions
diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst
index 823e407..2b7de80 100644
--- a/docs/release/release-notes/index.rst
+++ b/docs/release/release-notes/index.rst
@@ -170,23 +170,23 @@ Deliverables
Software
--------
-+-------------------------+-----------------------------------+---------------+
-| **Docker Container** | **Docker Image** | **Tag** |
-+-------------------------+-----------------------------------+---------------+
-| dovetail | opnfv/dovetail | ovp.2.0.0 |
-+-------------------------+-----------------------------------+---------------+
-| functest | opnfv/functest-smoke | fraser |
-+-------------------------+-----------------------------------+---------------+
-| functest | opnfv/functest-healthcheck | fraser |
-+-------------------------+-----------------------------------+---------------+
-| functest | opnfv/functest-features | fraser |
-+-------------------------+-----------------------------------+---------------+
-| functest | opnfv/functest-vnf | fraser |
-+-------------------------+-----------------------------------+---------------+
-| yardstick | opnfv/yardstick | stable |
-+-------------------------+-----------------------------------+---------------+
-| bottlenecks | opnfv/bottlenecks | stable |
-+-------------------------+-----------------------------------+---------------+
++-------------------------+-----------------------------------+----------------+
+| **Docker Container** | **Docker Image** | **Tag** |
++-------------------------+-----------------------------------+----------------+
+| dovetail | opnfv/dovetail | ovp-2.0.0 |
++-------------------------+-----------------------------------+----------------+
+| functest | opnfv/functest-smoke | opnfv-6.3.0 |
++-------------------------+-----------------------------------+----------------+
+| functest | opnfv/functest-healthcheck | opnfv-6.3.0 |
++-------------------------+-----------------------------------+----------------+
+| functest | opnfv/functest-features | opnfv-6.3.0 |
++-------------------------+-----------------------------------+----------------+
+| functest | opnfv/functest-vnf | opnfv-6.3.0 |
++-------------------------+-----------------------------------+----------------+
+| yardstick | opnfv/yardstick | ovp-2.0.0 |
++-------------------------+-----------------------------------+----------------+
+| bottlenecks | opnfv/bottlenecks | ovp-2.0.0 |
++-------------------------+-----------------------------------+----------------+
Docker images:
diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index fa8ad1a..9010c80 100644
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -447,8 +447,8 @@ the SUT.
$ wget -nc https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${DOVETAIL_HOME}/images
$ wget -nc http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2 -P ${DOVETAIL_HOME}/images
- $ sudo docker pull opnfv/dovetail:latest
- latest: Pulling from opnfv/dovetail
+ $ sudo docker pull opnfv/dovetail:ovp-2.0.0
+ ovp-2.0.0: Pulling from opnfv/dovetail
324d088ce065: Pull complete
2ab951b6c615: Pull complete
9b01635313e2: Pull complete
@@ -460,9 +460,7 @@ the SUT.
0ad9f4168266: Pull complete
d949894f87f6: Pull complete
Digest: sha256:7449601108ebc5c40f76a5cd9065ca5e18053be643a0eeac778f537719336c29
- Status: Downloaded newer image for opnfv/dovetail:latest
-
-An example of the <tag> is **latest**.
+ Status: Downloaded newer image for opnfv/dovetail:ovp-2.0.0
Offline Test Host
"""""""""""""""""
@@ -477,19 +475,19 @@ The Docker images and Cirros image below are necessary for all mandatory test ca
.. code-block:: bash
- $ sudo docker pull opnfv/dovetail:latest
- $ sudo docker pull opnfv/functest-smoke:fraser
- $ sudo docker pull opnfv/yardstick:stable
- $ sudo docker pull opnfv/bottlenecks:stable
+ $ sudo docker pull opnfv/dovetail:ovp-2.0.0
+ $ sudo docker pull opnfv/functest-smoke:opnfv-6.3.0
+ $ sudo docker pull opnfv/yardstick:ovp-2.0.0
+ $ sudo docker pull opnfv/bottlenecks:ovp-2.0.0
$ wget -nc http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P {ANY_DIR}
The other Docker images and test images below are only used by optional test cases.
.. code-block:: bash
- $ sudo docker pull opnfv/functest-healthcheck:fraser
- $ sudo docker pull opnfv/functest-features:fraser
- $ sudo docker pull opnfv/functest-vnf:fraser
+ $ sudo docker pull opnfv/functest-healthcheck:opnfv-6.3.0
+ $ sudo docker pull opnfv/functest-features:opnfv-6.3.0
+ $ sudo docker pull opnfv/functest-vnf:opnfv-6.3.0
$ wget -nc https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img -P {ANY_DIR}
$ wget -nc https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P {ANY_DIR}
$ wget -nc http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2 -P {ANY_DIR}
@@ -501,10 +499,10 @@ At the online host, save the images with the command below.
.. code-block:: bash
- $ sudo docker save -o dovetail.tar opnfv/dovetail:latest \
- opnfv/functest-smoke:fraser opnfv/functest-healthcheck:fraser \
- opnfv/functest-features:fraser opnfv/functest-vnf:fraser \
- opnfv/yardstick:stable opnfv/bottlenecks:stable
+ $ sudo docker save -o dovetail.tar opnfv/dovetail:ovp-2.0.0 \
+ opnfv/functest-smoke:opnfv-6.3.0 opnfv/functest-healthcheck:opnfv-6.3.0 \
+ opnfv/functest-features:opnfv-6.3.0 opnfv/functest-vnf:opnfv-6.3.0 \
+ opnfv/yardstick:ovp-2.0.0 opnfv/bottlenecks:ovp-2.0.0
The command above creates a dovetail.tar file with all the images, which can then be copied
to the Test Host. To load the Dovetail images on the Test Host execute the command below.
@@ -519,13 +517,13 @@ Now check to see that all Docker images have been pulled or loaded properly.
$ sudo docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
- opnfv/dovetail latest ac3b2d12b1b0 24 hours ago 784 MB
- opnfv/functest-smoke fraser 010aacb7c1ee 17 hours ago 594.2 MB
- opnfv/functest-healthcheck fraser 2cfd4523f797 17 hours ago 234 MB
- opnfv/functest-features fraser b61d4abd56fd 17 hours ago 530.5 MB
- opnfv/functest-vnf fraser 929e847a22c3 17 hours ago 1.87 GB
- opnfv/yardstick stable 84b4edebfc44 17 hours ago 2.052 GB
- opnfv/bottlenecks stable 3d4ed98a6c9a 21 hours ago 638 MB
+ opnfv/dovetail ovp-2.0.0 ac3b2d12b1b0 24 hours ago 784 MB
+ opnfv/functest-smoke opnfv-6.3.0 010aacb7c1ee 17 hours ago 594.2 MB
+ opnfv/functest-healthcheck opnfv-6.3.0 2cfd4523f797 17 hours ago 234 MB
+ opnfv/functest-features opnfv-6.3.0 b61d4abd56fd 17 hours ago 530.5 MB
+ opnfv/functest-vnf opnfv-6.3.0 929e847a22c3 17 hours ago 1.87 GB
+ opnfv/yardstick ovp-2.0.0 84b4edebfc44 17 hours ago 2.052 GB
+ opnfv/bottlenecks ovp-2.0.0 3d4ed98a6c9a 21 hours ago 638 MB
After copying and loading the Dovetail images at the Test Host, also copy the test images
(Ubuntu, Cirros and cloudify-manager) to the Test Host.
@@ -550,11 +548,12 @@ create a Dovetail container and get access to its shell.
-v /var/run/docker.sock:/var/run/docker.sock \
opnfv/dovetail:<tag> /bin/bash
-The ``-e`` option sets the DOVETAIL_HOME environment variable in the container and the
-``-v`` options map files in the Test Host to files in the container. The latter option
-allows the Dovetail container to read the configuration files and write result files into
-DOVETAIL_HOME on the Test Host. The user should be within the Dovetail container shell,
-once the command above is executed.
+The ``-e`` option sets the DOVETAIL_HOME environment variable in the container
+and the ``-v`` options mounts files from the test host to the destination path
+inside the container. The latter option allows the Dovetail container to read
+the configuration files and write result files into DOVETAIL_HOME on the Test
+Host. The user should be within the Dovetail container shell, once the command
+above is executed.
Running the OVP Test Suite
diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml
index a7d1f4c..b36f865 100644
--- a/etc/conf/bottlenecks_config.yml
+++ b/etc/conf/bottlenecks_config.yml
@@ -7,7 +7,7 @@
bottlenecks:
image_name: opnfv/bottlenecks
- docker_tag: stable
+ docker_tag: ovp-2.0.0
opts: '-id --privileged=true'
envs: '-e DEPLOY_SCENARIO={{deploy_scenario}} -e Yardstick_TAG=stable -e OUTPUT_FILE={{testcase}}.out'
volumes:
diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index b9453e1..88fc5f7 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -10,7 +10,7 @@
functest:
image_name: opnfv/functest-smoke
- docker_tag: fraser
+ docker_tag: opnfv-6.3.0
opts: '-id --privileged=true'
envs: '{{os_verify}} -e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO={{deploy_scenario}} -e NODE_NAME=unknown
-e TEST_DB_URL=file:///home/opnfv/functest/results/functest_results.txt'
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index 8cd5d9a..b61301e 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -12,7 +12,7 @@
yardstick:
image_name: opnfv/yardstick
- docker_tag: stable
+ docker_tag: ovp-2.0.0
opts: '-id --privileged=true'
envs: "{{os_verify}} -e YARDSTICK_BRANCH=fraser"
config: