Refactor arch-specific Dockerfile patching

[releng.git] / jjb / releng / opnfv-docker-arm.yml

diff --git a/jjb/releng/opnfv-docker-arm.yml b/jjb/releng/opnfv-docker-arm.yml
index b488592..3486a07 100644 (file)
--- a/jjb/releng/opnfv-docker-arm.yml
+++ b/jjb/releng/opnfv-docker-arm.yml
@@ -40,7 +40,7 @@
     other-receivers: &other-receivers
       receivers: ''
 
-    dockerfile: "Dockerfile.aarch64"
+    dockerfile: "Dockerfile"
     dockerdir: "docker"
     docker_repo_name: "opnfv/{project}_aarch64"
     arch_tag: ""
@@ -59,7 +59,6 @@
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-master'
           arch_tag: 'aarch64'
           <<: *master
@@ -67,7 +66,6 @@
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-graphite'
           arch_tag: 'aarch64'
           <<: *master
@@ -75,7 +73,6 @@
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-httpfrontend'
           arch_tag: 'aarch64'
           <<: *master
@@ -83,7 +80,6 @@
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-reporting'
           arch_tag: 'aarch64'
           <<: *master
@@ -91,7 +87,6 @@
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-swaggerui'
           arch_tag: 'aarch64'
           <<: *master
@@ -112,7 +107,6 @@
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-master'
           arch_tag: 'aarch64'
           <<: *euphrates
@@ -120,7 +114,6 @@
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-graphite'
           arch_tag: 'aarch64'
           <<: *euphrates
@@ -128,7 +121,6 @@
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-httpfrontend'
           arch_tag: 'aarch64'
           <<: *euphrates
@@ -136,7 +128,6 @@
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-reporting'
           arch_tag: 'aarch64'
           <<: *euphrates
@@ -144,7 +135,6 @@
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
-          dockerfile: 'Dockerfile'
           docker_repo_name: 'opnfv/storperf-swaggerui'
           arch_tag: 'aarch64'
           <<: *euphrates