Compare commits

..

No commits in common. "dec6cf211a94dad2b3c0265d0461d4edd24e7ec8" and "b2a882079accf6142e8c139f63dd09261ee3b773" have entirely different histories.

2 changed files with 17 additions and 21 deletions

View file

@ -40,10 +40,7 @@ from various contexts of CA, CI and OCI / OS.
## How ## How
| Variable | Description | Default | | Variable | Description | Default |
|:--------------------|:--------------------------|:--------------------------------| |:----------------|:------------------------|:--------------------------------|
| SPCD_BRANCH_RELEASE | Release deployment branch | main |
| SPCD_BRANCH_STAGING | Staging deployment branch | dev |
| SPCD_BRANCH_FEATURE | Feature deployment branch | f |
| SPCD_CA_n | Numbered CA certificate | | | SPCD_CA_n | Numbered CA certificate | |
| SPCD_DNS | Space separated servers | 9.9.9.9 | | SPCD_DNS | Space separated servers | 9.9.9.9 |
| SPCD_GIT_MAIN | Main Git repository | spcd | | SPCD_GIT_MAIN | Main Git repository | spcd |

View file

@ -3,7 +3,6 @@
# defaults # defaults
[ -n "${SPCD_BRANCH_RELEASE}" ] || SPCD_BRANCH_RELEASE="main" [ -n "${SPCD_BRANCH_RELEASE}" ] || SPCD_BRANCH_RELEASE="main"
[ -n "${SPCD_BRANCH_STAGING}" ] || SPCD_BRANCH_STAGING="dev" [ -n "${SPCD_BRANCH_STAGING}" ] || SPCD_BRANCH_STAGING="dev"
[ -n "${SPCD_BRANCH_FEATURE}" ] || SPCD_BRANCH_FEATURE="f"
[ -n "${SPCD_DNS}" ] || SPCD_DNS="\ [ -n "${SPCD_DNS}" ] || SPCD_DNS="\
9.9.9.9 \ 9.9.9.9 \
" "
@ -130,7 +129,7 @@ spcd_set_environment_variables() {
fi fi
# check project variables # check project variables
case "${SPCD_PROJECT_BRANCH}" in case "${SPCD_PROJECT_BRANCH}" in
"${SPCD_BRANCH_RELEASE}" | "${SPCD_BRANCH_STAGING}" | "${SPCD_BRANCH_FEATURE}") ;; "${SPCD_BRANCH_RELEASE}" | "${SPCD_BRANCH_STAGING}") ;;
*) spcd_error_ci "SPCD_PROJECT_BRANCH" ;; *) spcd_error_ci "SPCD_PROJECT_BRANCH" ;;
esac esac
[ -n "${SPCD_PROJECT_ROOT}" ] || spcd_error_ci "SPCD_PROJECT_ROOT" [ -n "${SPCD_PROJECT_ROOT}" ] || spcd_error_ci "SPCD_PROJECT_ROOT"
@ -632,7 +631,7 @@ spcd_install_python_modules() {
for spcd_ipm__repository in "${SPCD_GIT_MAIN}" "${SPCD_GIT_ROOT}"; do for spcd_ipm__repository in "${SPCD_GIT_MAIN}" "${SPCD_GIT_ROOT}"; do
case "${spcd_ipm__repository}" in case "${spcd_ipm__repository}" in
http*) spcd_ipm__url="${spcd_ipm__repository}" ;; http*) spcd_ipm__url="${spcd_ipm__repository}" ;;
*/*) spcd_ipm__url="${SPCD_PROJECT_ROOT}/${spcd_ipm__repository}" ;; /*) spcd_ipm__url="${SPCD_PROJECT_ROOT}${spcd_ipm__repository}" ;;
*) spcd_ipm__url="\ *) spcd_ipm__url="\
${SPCD_PROJECT_ROOT}/${SPCD_PROJECT_PATH}/${spcd_ipm__repository}" ;; ${SPCD_PROJECT_ROOT}/${SPCD_PROJECT_PATH}/${spcd_ipm__repository}" ;;
esac esac