From f0d6b7a2fd63aa393cab099259bcbdf5834a58fd Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Mon, 29 Jul 2019 15:27:19 +0300 Subject: [PATCH 1/2] Manifest file path The manifest file path was incorrectly set in the stable docker-compose files. --- .ci/build-images.sh | 2 ++ .ci/fetch-artifacts.sh | 1 + container/stable/arm/docker-compose.yml | 2 +- container/stable/x86/docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.ci/build-images.sh b/.ci/build-images.sh index 95f7ae3a..8aaf5169 100755 --- a/.ci/build-images.sh +++ b/.ci/build-images.sh @@ -96,7 +96,9 @@ function _main # builds x86 and arm images based on manifest files if [[ ! -z ${BUILD_TAG} ]] then + GIT_MANIFEST_BRANCH=refs/tags/gateway/${BUILD_TAG} + _build "${DOCKERFILE_PATH}/stable/arm/docker-compose.yml" "arm" "--no-cache" _build "${DOCKERFILE_PATH}/stable/x86/docker-compose.yml" "x86" "--no-cache" else diff --git a/.ci/fetch-artifacts.sh b/.ci/fetch-artifacts.sh index fef13950..84b93a06 100755 --- a/.ci/fetch-artifacts.sh +++ b/.ci/fetch-artifacts.sh @@ -35,4 +35,5 @@ docker run \ wirepas/gateway-arm:"${BUILD_TAG}" \ bash -c "${COMMAND}" +rm dist/wirepas_gateway*linux_x86_64.whl twine check dist/wirepas_gateway* diff --git a/container/stable/arm/docker-compose.yml b/container/stable/arm/docker-compose.yml index a1ea08e3..0189aa97 100644 --- a/container/stable/arm/docker-compose.yml +++ b/container/stable/arm/docker-compose.yml @@ -19,7 +19,7 @@ services: DOCKER_BASE: wirepas/base:1.1-raspbian CROSS_BUILD_START_CMD: cross-build-start CROSS_BUILD_END_CMD: cross-build-end - GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway.xml/stable.xml} + GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway/stable.xml} GIT_MANIFEST_URL: ${GIT_MANIFEST_URL:-https://github.com/wirepas/manifest.git} GIT_MANIFEST_BRANCH: ${GIT_MANIFEST_BRANCH:-master} diff --git a/container/stable/x86/docker-compose.yml b/container/stable/x86/docker-compose.yml index 13718d7a..8ad46a49 100644 --- a/container/stable/x86/docker-compose.yml +++ b/container/stable/x86/docker-compose.yml @@ -19,7 +19,7 @@ services: DOCKER_BASE: wirepas/base:1.1-ubuntu CROSS_BUILD_START_CMD: ":" CROSS_BUILD_END_CMD: ":" - GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway.xml/stable.xml} + GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway/stable.xml} GIT_MANIFEST_URL: ${GIT_MANIFEST_URL:-https://github.com/wirepas/manifest.git} GIT_MANIFEST_BRANCH: ${GIT_MANIFEST_BRANCH:-master} From a944e5d81969afebad9e7e184ca69714e1815c6e Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Mon, 29 Jul 2019 15:36:29 +0300 Subject: [PATCH 2/2] Wheel file needed by jenkins ci --- .ci/fetch-artifacts.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/fetch-artifacts.sh b/.ci/fetch-artifacts.sh index 84b93a06..fef13950 100755 --- a/.ci/fetch-artifacts.sh +++ b/.ci/fetch-artifacts.sh @@ -35,5 +35,4 @@ docker run \ wirepas/gateway-arm:"${BUILD_TAG}" \ bash -c "${COMMAND}" -rm dist/wirepas_gateway*linux_x86_64.whl twine check dist/wirepas_gateway*