Merge branch 'release/84'

Jenkinsfile

@@ -100,8 +100,8 @@ pipeline {
                     def cdabclientrpm = findFiles(glob: "src/docker/cdab-client-*.rpm")
                     def cdabremoteclientrpm = findFiles(glob: "src/docker/cdab-remote-client-*.rpm")
                     def descriptor = readDescriptor()
-                    def testsuite = docker.build(descriptor.docker_image_name, "--build-arg CDAB_RELEASE=${descriptor.version} --build-arg CDAB_CLIENT_RPM=${cdabclientrpm[0].name} --build-arg CDAB_REMOTE_CLIENT_RPM=${cdabremoteclientrpm[0].name} ./src/docker")
                     def mType=getTypeOfVersion(env.BRANCH_NAME)
+                    def testsuite = docker.build(descriptor.docker_image_name, "--build-arg CDAB_RELEASE=${mType}${descriptor.version} --build-arg CDAB_CLIENT_RPM=${cdabclientrpm[0].name} --build-arg CDAB_REMOTE_CLIENT_RPM=${cdabremoteclientrpm[0].name} ./src/docker")
                     docker.withRegistry('https://registry.hub.docker.com', 'dockerhub-emmanuelmathot') {
                       testsuite.push("${mType}${descriptor.version}")
                       testsuite.push("${mType}latest")

README.md

@@ -1,39 +1,33 @@
-[![Build Status](https://build.terradue.com/buildStatus/icon?job=Terradue%2Fcdab-testsuite%2Fb'develop')](https://build.terradue.com/blue/organizations/jenkins/Terradue%2Fcdab-testsuite/activity?branch=b'develop')
+[![Build Status](https://build.terradue.com/buildStatus/icon?job=Terradue%2Fcdab-testsuite%2Fb'master')](https://build.terradue.com/blue/organizations/jenkins/Terradue%2Fcdab-testsuite/activity?branch=b'master')
 
 
 ![CDAB logo](doc/images/cdab-logo.jpg)
 
 # CDAB Software Test Suite
 
-Copernicus Sentinels Data Access Worldwide Benchmark Test Suite is the software suite used to run Test Scenarios for bechmarking various targets.
+Copernicus Sentinels Data Access Worldwide Benchmark Test Suite is the software suite used to run Test Scenarios for bechmarking various Copernicus Data Provider targets.
 
-The current supported target sites are
+The current supported Target Sites are
 
-* Conventional Data Access Hubs:
+* Data Access Hubs using [DHuS Data Hub](https://sentineldatahub.github.io):
   * [Copernicus Open Access Hub (aka SciHub)](https://scihub.copernicus.eu/)
   * [Copernicus Open Access Hub API (aka APIHub)](https://scihub.copernicus.eu/twiki/do/view/SciHubWebPortal/APIHubDescription)
   * [Copernicus Collaborative Data Hub (aka ColHub)](https://colhub.copernicus.eu/)
   * [Copernicus Sentinels International Access Hub (aka IntHub)](https://inthub.copernicus.eu/)
-* DIAS
+  * Any Data Access Hubs using [DHuS Data Hub](https://sentineldatahub.github.io) software
+  * [CODE-DE](https://code-de.org/)
+* DIASes
   * [CREODIAS](https://creodias.eu/)
   * [Mundi Web Services](https://mundiwebservices.com/)
   * [ONDA](https://www.onda-dias.eu/)
   * [Sobloo](https://sobloo.eu/)
 
+# Repository Content
 
-## Getting started
+This repository is a public repository with all the source code used for building the CDAB Test Suite
 
-The CDAB Test Suite is built automatically providing different assets with each release:
-- Source code archive
-- Set of binaries for the clients as archives and RPM package
-- A docker image available publicly as [esacdab/testsuite](https://hub.docker.com/repository/docker/esacdab/testsuite)
+The CDAB Test Suite is built automatically providing a docker image available publicly at [esacdab/testsuite](https://hub.docker.com/repository/docker/esacdab/testsuite) that can be used as Test Site.
 
-## Using the Docker image
+# Getting Started
 
-### General Command Line Access
-
-    docker run -it esacdab/testsuite /bin/bash
-
-## Executing the Copernicus Data Access Benchmarking Tool and running Test Scenarios
-
-The detailed information for executing the test scenarios are described in [the CDAB Test Suite wiki](https://github.com/Terradue/cdab-testsuite/wiki)
+You can start now using the Test Suite following the [Getting Started guide](https://github.com/Terradue/cdab-testsuite/wiki)