From 0f906bf562ab6cd68618db2747a0b8ecd178b1b3 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Tue, 23 Aug 2016 14:46:48 +0200 Subject: [PATCH] calamari-server-trusty: Upload the packages to chacra Signed-off-by: Boris Ranto --- calamari-server-trusty/build/build | 16 ++++++++++++++++ .../definitions/calamari-server-trusty.yml | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/calamari-server-trusty/build/build b/calamari-server-trusty/build/build index d1ca2ef5..7e384e2d 100644 --- a/calamari-server-trusty/build/build +++ b/calamari-server-trusty/build/build @@ -1,4 +1,11 @@ set -e + +pkgs=( "chacractl>=0.0.4" ) +install_python_packages "pkgs[@]" + +# create the .chacractl config file using global variables +make_chacractl_config + echo "Building ${BRANCH}" rm -f ${WORKSPACE}/*.deb ${WORKSPACE}/calamari-repo-trusty.tar.gz cd ${WORKSPACE}/ @@ -19,3 +26,12 @@ cd $WORKSPACE rm -rf $BRANCH mkdir $BRANCH mv pkgs/*deb $BRANCH + +[ "$TEST" = true ] && chacra_ref="test" || chacra_ref="$BRANCH" +DISTRO=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"` +chacra_endpoint="calamari-server/${chacra_ref}/${GIT_COMMIT}/${DISTRO}/universal/all" + +[ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags="" + +# push binaries to chacra +find "$BRANCH" | grep 'deb$' | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint} diff --git a/calamari-server-trusty/config/definitions/calamari-server-trusty.yml b/calamari-server-trusty/config/definitions/calamari-server-trusty.yml index 5a232132..b782627f 100644 --- a/calamari-server-trusty/config/definitions/calamari-server-trusty.yml +++ b/calamari-server-trusty/config/definitions/calamari-server-trusty.yml @@ -2,7 +2,10 @@ block-downstream: false block-upstream: false builders: - - shell: !include-raw ../../build/build + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/build description: '' logrotate: artifactDaysToKeep: '-1' -- 2.39.5