Merge "docker build -f should use relative path to PATH, not working directory"

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 52b1c79..0fe76f0 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -86,25 +86,25 @@
       - 'clover-ns-nginx-lb':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          dockerfile: 'subservices/lb/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-nginx-proxy':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          dockerfile: 'subservices/proxy/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-nginx-server':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          dockerfile: 'subservices/server/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-snort-ids':
           project: 'clover'
           dockerdir: 'samples/services/snort_ids/docker'
-          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          dockerfile: 'Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'cperf':
@@ -228,25 +228,25 @@
       - 'clover-ns-nginx-lb':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          dockerfile: 'subservices/lb/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-nginx-proxy':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          dockerfile: 'subservices/proxy/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-nginx-server':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          dockerfile: 'subservices/server/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-snort-ids':
           project: 'clover'
           dockerdir: 'samples/services/snort_ids/docker'
-          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          dockerfile: 'Dockerfile'
           <<: *fraser
           <<: *other-receivers
     # yamllint enable rule:key-duplicates