Use Arch more consistently

We used DEB_ARCH instead of ARCH when pushing to chacra in
samba/calamari. This meant that we pushed to amd64 instead of x86_64.

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/calamari/build/build_deb b/calamari/build/build_deb
index 826d9c4652fc43d33bb261059c4c8a639d7b10b6..53e233eaea542d84de75a4d940abdac3601d1a04 100644 (file)
--- a/calamari/build/build_deb
+++ b/calamari/build/build_deb
@@ -38,7 +38,7 @@ chacra_endpoint="calamari/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${DIST}"
 [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
 
 # push binaries to chacra
-find ../calamari-server*.deb ../calamari-server*.changes | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${DEB_ARCH}/
+find ../calamari-server*.deb ../calamari-server*.changes | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/
 
 # start repo creation
 $VENV/chacractl repo update ${chacra_endpoint}

diff --git a/samba/build/build_deb b/samba/build/build_deb
index 62519c37c63550f1b8bd222466faed4bd408e031..893f7c55bb657375ac630aa3a353383197291c42 100644 (file)
--- a/samba/build/build_deb
+++ b/samba/build/build_deb
@@ -49,7 +49,7 @@ chacra_endpoint="samba/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${DIST}"
 [ "$FORCE" = true ] && chacra_flags="--force" || chacra_flags=""
 
 # push binaries to chacra
-find *.deb | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${DEB_ARCH}/
+find *.deb | $VENV/chacractl binary ${chacra_flags} create ${chacra_endpoint}/${ARCH}/
 PACKAGE_MANAGER_VERSION=$(dpkg-deb -f $(find *"$DEB_ARCH".deb | head -1) Version)
 
 # write json file with build info