docker build: Update saltstack repo URL, locale

[fuel.git] / ci / build.sh

diff --git a/ci/build.sh b/ci/build.sh
index 8fab2ca..3da6705 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -42,6 +42,9 @@ source "${DEPLOY_DIR}/lib_jump_common.sh"
 [ ! "${TERM:-unknown}" = 'unknown' ] || export TERM=vt220
 [ "${CACHE_INVALIDATE}" = 0 ] || CACHE_INVALIDATE=$(date +%s)
 
+export LC_ALL=en_US.utf-8
+export LANG=en_US.utf-8
+
 #
 # END of variables to customize
 ##############################################################################
@@ -56,30 +59,29 @@ trap do_exit SIGINT SIGTERM EXIT
 # Set no restrictive umask so that Jenkins can remove any residuals
 umask 0000
 
-# Clone git submodules and apply our patches
-make -C "${MCP_REPO_ROOT_PATH}/mcp/patches" deepclean patches-import
-
 pushd "${DEPLOY_DIR}" > /dev/null
 
 # Install distro packages and pip-managed prerequisites
-PYTHON_BIN_PATH="$(python -m site --user-base)/bin"
-PATH="$PATH:$PYTHON_BIN_PATH"
 notify "[NOTE] Installing required build-time distro and pip pkgs" 2
 jumpserver_pkg_install 'build'
-python -m pip install --upgrade pipenv --user
+PYTHON_BIN_PATH="$(python3 -m site --user-base)/bin"
+PATH="$PATH:$PYTHON_BIN_PATH"
+# Clone git submodules and apply our patches
+make -C "${MCP_REPO_ROOT_PATH}/mcp/patches" deepclean patches-import
+python3 -m pip install --upgrade pipenv --user
 docker_install
 
 popd > /dev/null
 pushd "${DOCKER_DIR}" > /dev/null
 
-env PIPENV_HIDE_EMOJIS=1 VIRTUALENV_ALWAYS_COPY=1 python -m pipenv --two install
-env PIPENV_HIDE_EMOJIS=1 VIRTUALENV_ALWAYS_COPY=1 python -m pipenv install invoke
+env PIPENV_HIDE_EMOJIS=1 VIRTUALENV_ALWAYS_COPY=1 python3 -m pipenv --three install
+env PIPENV_HIDE_EMOJIS=1 VIRTUALENV_ALWAYS_COPY=1 python3 -m pipenv install invoke
 # shellcheck disable=SC2086
-env PIPENV_HIDE_EMOJIS=1 python -m pipenv run \
+env PIPENV_HIDE_EMOJIS=1 python3 -m pipenv run \
   invoke build saltmaster-reclass \
     --require 'salt salt-formulas opnfv reclass tini-saltmaster' \
     --dist=ubuntu \
-    --dist-rel=xenial \
+    --dist-rel=bionic \
     --formula-rev=nightly \
     --opnfv-tag="${DOCKER_TAG}" \
     --salt="${SALT_VERSION}" \
@@ -87,13 +89,15 @@ env PIPENV_HIDE_EMOJIS=1 python -m pipenv run \
         CACHE_INVALIDATE=\"${CACHE_INVALIDATE}\"" \
     ${DOCKER_PUSH}
 
-env PIPENV_HIDE_EMOJIS=1 python -m pipenv run \
+env PIPENV_HIDE_EMOJIS=1 python3 -m pipenv run \
   invoke build saltminion-maas \
     --require 'maas' \
     --dist=ubuntu \
-    --dist-rel=xenial \
+    --dist-rel=bionic \
     --opnfv-tag="${DOCKER_TAG}" \
     --salt="${SALT_VERSION}" \
+    --build-arg-extra " \
+        CACHE_INVALIDATE=\"${CACHE_INVALIDATE}\"" \
     ${DOCKER_PUSH}
 
 popd > /dev/null