Merge dev in master

.gitlab-ci.yml

 stages:
     - build
-    - test_dev
+    - test
 
-before_script:
-  - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.cern.ch
 
-variables:
-  CONTAINER_TEST_IMAGE: $CI_PROJECT_PATH:$CI_BUILD_REF_NAME
-  CONTAINER_RELEASE_IMAGE: registry.example.com/my-group/my-project:latest
+build dev:
+    stage: build
+    tags:
+        - docker-image-build
+    script: "echo" # unused but this line is required by GitLab CI
+    variables:
+        TO: $CI_REGISTRY_IMAGE:atlas-kv-bmk-v17.8.0.9_test # where to push resulting image
+        CONTEXT_DIR: atlas/kv-bmk-v17.8.0.9/
+    except:
+        - master
 
-build kv:
-  stage: build
-  image: gitlab-registry.cern.ch/cloud/ciadm:qa
-  script:
-    - cd atlas/kv-bmk-v17.8.0.9/
-    - echo $CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_SHA 
-    - echo $CI_PROJECT_PATH
-    - echo $CI_COMMIT_TAG
-    - echo $CI_PROJECT_IMAGE
-    #- docker build -t gitlab-registry.cern.ch/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_BUILD_REF .
-    #- docker push gitlab-registry.cern.ch/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_BUILD_REF
-  only:
-    - master
-   
 test dev:
-  stage: test_dev
-  image: gitlab-registry.cern.ch/cloud/ciadm:qa
-  script:
-    - docker pull gitlab-registry.cern.ch/$CI_PROJECT_IMAGE
-    - cd atlas/kv-bmk-v17.8.0.9/
-    - docker build -t test-image .
-    - docker run -it --rm -w /kv-bmk test-image ./kv-bmk.sh
-  except:
-    - master
+    stage: test
+    image: $CI_REGISTRY_IMAGE:atlas-kv-bmk-v17.8.0.9_test
+    script:
+        - cd /kv-bmk
+        - ./kv-bmk.sh
+    except:
+        - master
+
+build prod:
+    stage: build
+    tags:
+        - docker-image-build
+    script: "echo" # unused but this line is required by GitLab CI
+    variables:
+        TO: $CI_REGISTRY_IMAGE:atlas-kv-bmk-v17.8.0.9 # where to push resulting image
+        CONTEXT_DIR: atlas/kv-bmk-v17.8.0.9/
+        NO_CACHE: "TRUE"
+    only:
+        - master
+test prod:
+    stage: test
+    image: $CI_REGISTRY_IMAGE:atlas-kv-bmk-v17.8.0.9
+    script:
+        - cd /kv-bmk
+        - ./kv-bmk.sh
+    only:
+        - master
+