diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07bb846475ca..e0424a43a37c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -396,7 +396,7 @@ variables: variables: DEPLOY_USER: reposync DEPLOY_HOST: web.inverse.ca - GITLAB_DEPLOY_DIR: ${CI_PIPELINE_ID} + PPA_ID: ${CI_PIPELINE_ID} tags: - shell diff --git a/ci/lib/upload/deploy-artifacts.sh b/ci/lib/upload/deploy-artifacts.sh index 7de21223d43a..8899bbbb2135 100755 --- a/ci/lib/upload/deploy-artifacts.sh +++ b/ci/lib/upload/deploy-artifacts.sh @@ -21,6 +21,9 @@ DEPLOY_HOST=${DEPLOY_HOST:-web.inverse.ca} PUBLIC_REPO_BASE_DIR=${PUBLIC_REPO_BASE_DIR:-/var/www/inverse.ca/downloads/PacketFence} +# CI +CI_PLATFORM=${CI_PLATFORM:-gitlab} + # RPM DEPLOY_SRPMS=${DEPLOY_SRPMS:-no} RPM_BASE_DIR=${RPM_BASE_DIR:-"${PUBLIC_REPO_BASE_DIR}"} @@ -34,7 +37,7 @@ DEB_DEPLOY_DIR=${DEB_DEPLOY_DIR:-foo} DEB_RESULT_DIR=${DEB_RESULT_DIR:-"${RESULT_DIR}/debian"} # Maintenance -GITLAB_DEPLOY_DIR=${GITLAB_DEPLOY_DIR:-tmp} +PPA_ID=${PPA_ID:-tmp} # CI # automatically set up by CI based on environment @@ -168,7 +171,7 @@ packetfence_ci_lib_deploy() { ppa_deploy() { # warning: slashs at end of dirs are significant for rsync src_dir="$PUBLIC_DIR/" - dst_repo="$PUBLIC_REPO_BASE_DIR/gitlab/$GITLAB_DEPLOY_DIR/" + dst_repo="$PUBLIC_REPO_BASE_DIR/$CI_PLATFORM/$PPA_ID/" dst_dir="$DEPLOY_USER@$DEPLOY_HOST:$dst_repo" declare -p src_dir dst_dir echo "rsync: $src_dir -> $dst_dir"