diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-11-08 03:19:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-08 03:19:21 +0000 |
| commit | 43a05d45f99d31c42a11578dce3f45c74745145d (patch) | |
| tree | 1e54d7bf2c6d66e50900a21416c416aa8c3d357d /jjb | |
| parent | 3ade521d53d4ed4fd8df232dff75a1869dc01e56 (diff) | |
| parent | f7068f8a89d2d5f83a2b2d26477ee17ccbe85efe (diff) | |
Merge "Refactor arch-specific Dockerfile patching"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/releng/opnfv-docker-arm.yml | 12 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.sh | 21 |
2 files changed, 8 insertions, 25 deletions
diff --git a/jjb/releng/opnfv-docker-arm.yml b/jjb/releng/opnfv-docker-arm.yml index b488592db..3486a0775 100644 --- 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 diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index 402099a91..6be6b18d8 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -54,20 +54,13 @@ if [[ -n "$(docker images | grep $DOCKER_REPO_NAME)" ]]; then done fi -cd $WORKSPACE/$DOCKER_DIR -HOST_ARCH=$(uname -m) -if [ ! -f "${DOCKERFILE}" ]; then - # If this is expected to be a Dockerfile for other arch than x86 - # and it does not exist, but there is a patch for the said arch, - # then apply the patch and create the Dockerfile.${HOST_ARCH} file - if [[ "${DOCKERFILE}" == *"${HOST_ARCH}" && \ - -f "Dockerfile.${HOST_ARCH}.patch" ]]; then - patch -o Dockerfile."${HOST_ARCH}" Dockerfile \ - Dockerfile."${HOST_ARCH}".patch - else - echo "ERROR: No Dockerfile or ${HOST_ARCH} patch found." - exit 1 - fi +cd "$WORKSPACE/$DOCKER_DIR" || exit 1 +HOST_ARCH="$(uname -m)" +#If there is a patch for other arch then x86, apply the patch and +#replace Dockerfile file +dockerfile_patch="Dockerfile.${HOST_ARCH}.patch" +if [[ -f "${dockerfile_patch}" ]]; then + patch -f Dockerfile -p1 < "${dockerfile_patch}" fi # Get tag version |