From 37796277f5f7c4d0b86cc147abf0352b6c556db2 Mon Sep 17 00:00:00 2001 From: nqb Date: Mon, 28 Nov 2022 22:23:46 +0100 Subject: [PATCH] deploy packetfence-ci-lib package in a common location --- .gitlab-ci.yml | 1 + ci/lib/upload/deploy-artifacts.sh | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64ab132e91ad..675e8499d17b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -470,6 +470,7 @@ variables: script: - ./${UPLOAD_DIR}/deploy-artifacts.sh packetfence-release - ./${UPLOAD_DIR}/deploy-artifacts.sh packetfence-export + - ./${UPLOAD_DIR}/deploy-artifacts.sh packetfence-ci-lib tags: - shell diff --git a/ci/lib/upload/deploy-artifacts.sh b/ci/lib/upload/deploy-artifacts.sh index ccd93849f975..7de21223d43a 100755 --- a/ci/lib/upload/deploy-artifacts.sh +++ b/ci/lib/upload/deploy-artifacts.sh @@ -149,6 +149,22 @@ packetfence_export_deploy() { done } +packetfence_ci_lib_deploy() { + # Deb (only) + for release_name in $(ls $DEB_RESULT_DIR); do + src_dir="$DEB_RESULT_DIR/${release_name}" + dst_repo="$DEB_BASE_DIR/debian" + dst_dir="$DEPLOY_USER@$DEPLOY_HOST:$dst_repo" + pf_ci_lib_deb_file=$(basename $(ls $src_dir/packetfence-ci-lib*)) + pf_ci_lib_deb_dest_name=${PF_CI_LIB_DEB_DEST_NAME:-"packetfence-ci-lib_${PF_MINOR_RELEASE}.deb"} + declare -p src_dir dst_dir pf_ci_lib_deb_file pf_ci_lib_deb_dest_name + + echo "scp: ${src_dir}/${pf_ci_lib_deb_file} -> ${dst_dir}/${pf_ci_lib_deb_dest_name}" + scp "${src_dir}/${pf_ci_lib_deb_file}" "${dst_dir}/${pf_ci_lib_deb_dest_name}" \ + || die "scp failed" + done +} + ppa_deploy() { # warning: slashs at end of dirs are significant for rsync src_dir="$PUBLIC_DIR/" @@ -185,6 +201,7 @@ case $1 in deb) deb_deploy ;; packetfence-release) packetfence_release_deploy ;; packetfence-export) packetfence_export_deploy ;; + packetfence-ci-lib) packetfence_ci_lib_deploy ;; ppa) ppa_deploy ;; website) website_deploy ;; *) die "Wrong argument"