Commit b8e89a40 authored by Stephane Bausseron's avatar Stephane Bausseron

Merge branch 'feature/disable-service' into 'master'

Add disable-service parameter (CITBX_DISABLED_SERVICES) to disable specified services

See merge request ercom/citbx4gitlab!14
parents 8b34612f 523f2813
# Cangelog
## HEAD (next release)
## 3.1.0
* [FIX/bashcomp] Fix number calculation in the _citbx4gitlab_compgen function
* Add disable-service parameter (CITBX_DISABLED_SERVICES) to disable specified services
## 3.0.1
* [FIX] regression: CITBX_TOOL_NAME not defined when tools/gitlab-ci/ is called directly
......@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <>.
# display a message
print_log() {
......@@ -570,6 +570,8 @@ $(for j in "${CITBX_JOB_LIST[@]}"; do echo " $j"; done | sort -u)"
-d "Use a specific shell to run the job"
bashopts_declare -n CITBX_WAIT_FOR_SERVICE_START -l wait-srv-started -t number -v 0 \
-d "Wait for service start (time in seconds)"
bashopts_declare -n CITBX_DISABLED_SERVICES -l disable-service -t string \
-d "Disable a service" -m add
bashopts_declare -n CITBX_SERVICE_DOCKER_PRIVILEGED -l service-privileged -t boolean \
-d "Start service docker container in privileged mode" -v "$CITBX_DEFAULT_SERVICE_DOCKER_PRIVILEGED"
......@@ -854,6 +856,11 @@ case "$CITBX_JOB_EXECUTOR" in
local image=$1
local name=$2
local ip
local pattern='\b'"$name"'\b'
if [[ "${CITBX_DISABLED_SERVICES[*]}" =~ $pattern ]]; then
print_note "Skipping $name service start"
return 0
args+=(--name "$CITBX_DOCKER_PREFIX-$name" --label "$CITBX_DOCKER_PREFIX")
shift 2
if [ -n "$1" ]; then
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment