Fetch artifacts from correct docker tag (#86)

.ci/build-images.sh

@@ -15,6 +15,7 @@ export GIT_MANIFEST_URL
 export GIT_MANIFEST_BRANCH
 export LXGW_C_MESH_API_HASH
 export LXGW_SERVICES_HASH
+export BUILD_TAG
 
 SKIP_PULL=${1:-}
 
@@ -100,15 +101,17 @@ function _main
         _build "${DOCKERFILE_PATH}/stable/x86/docker-compose.yml" "x86" "--no-cache"
     else
         BUILD_TAG="edge"
-    fi
 
-    # builds x86 and arm images based on top of current revision
-    if [[ -z ${SKIP_PULL} ]]
-    then
-        _fetch_dependencies
+        # builds x86 and arm images based on top of current revision
+        if [[ -z ${SKIP_PULL} ]]
+        then
+            _fetch_dependencies
+        fi
+        _build "${DOCKERFILE_PATH}/dev/docker-compose.yml" "arm"
+        _build "${DOCKERFILE_PATH}/dev/docker-compose.yml" "x86"
     fi
-    _build "${DOCKERFILE_PATH}/dev/docker-compose.yml" "arm"
-    _build "${DOCKERFILE_PATH}/dev/docker-compose.yml" "x86"
+
+
 }
 
 

.ci/deploy-pypi.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Wirepas Oy
+
+ARTIFACT_PATH=${1:-"./dist/*"}
+
+TWINE_USERNAME=${TWINE_USERNAME:-"Wirepas"}
+TWINE_PASSWORD=${TWINE_PASSWORD:-${PYPI_PWD}}
+TWINE_REPOSITORY=${TWINE_REPOSITORY}
+TWINE_REPOSITORY_URL=${TWINE_REPOSITORY_URL}
+
+twine check "${ARTIFACT_PATH}"
+twine upload "${ARTIFACT_PATH}"

.ci/fetch-artifacts.sh

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 # Copyright 2019 Wirepas Ltd
 
+BUILD_TAG=${BUILD_TAG:-"edge"}
+
 rm -rf dist/ || true
 mkdir dist
 
 USERGROUP="$(id -u):$(id -g)"
-COMMAND="cp -v --no-preserve=ownership \${TRANSPORT_SERVICE}/wirepas_gateway-*.whl . \
+COMMAND="cp -v --no-preserve=ownership \${TRANSPORT_SERVICE}/wirepas_gateway-* . \
          && cp -v --no-preserve=ownership /usr/local/bin/sinkService . \
          && tar -czvf sinkService-\${ARCH}.tar.gz sinkService \
          && rm sinkService \
@@ -19,7 +21,7 @@ docker run \
         -e ARCH="x86" \
         -w /data \
         -v "$(pwd)/dist":/data \
-        wirepas/gateway-x86:edge \
+        wirepas/gateway-x86:"${BUILD_TAG}" \
         bash -c "${COMMAND}"
 
 echo "fetching arm wheel"
@@ -30,5 +32,7 @@ docker run \
         -w /data \
         -v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static \
         -v "$(pwd)/dist":/data \
-        wirepas/gateway-rpi:latest \
+        wirepas/gateway-arm:"${BUILD_TAG}" \
         bash -c "${COMMAND}"
+
+twine check dist/wirepas_gateway*

.travis.yml

@@ -47,12 +47,8 @@ deploy:
     tags: true
     branch: master
 
-- provider: pypi
-  user: Wirepas
-  password: ${PYPI_PWD}
-  skip_existing: true
-  skip_cleanup: true
-  distributions: "sdist bdist_wheel"
+- provider: script
+  script: bash .ci/deploy-pypi.sh ${TRAVIS_BUILD_DIR}/dist/${PYTHON_PKG_NAME}*
   on:
     tags: true
     branch: master