Commit 5d6234cd authored by Alberto Gonzalez Barneo's avatar Alberto Gonzalez Barneo
Browse files

Added flask dependency

parent 3f755fa6

my_deploy.sh

+6 −6
Original line number Original line Diff line number Diff line
@@ -80,11 +80,11 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui" 
#   To manage QKD Apps, "service" requires "qkd_app" to be deployed

#   To manage QKD Apps, "service" requires "qkd_app" to be deployed

#   before "service", thus we "hack" the TFS_COMPONENTS environment variable prepending the

#   before "service", thus we "hack" the TFS_COMPONENTS environment variable prepending the

#   "qkd_app" only if "service" is already in TFS_COMPONENTS, and re-export it.

#   "qkd_app" only if "service" is already in TFS_COMPONENTS, and re-export it.

#if [[ "$TFS_COMPONENTS" == *"service"* ]]; then

if [[ "$TFS_COMPONENTS" == *"service"* ]]; then

#    BEFORE="${TFS_COMPONENTS% service*}"

    BEFORE="${TFS_COMPONENTS% service*}"

#    AFTER="${TFS_COMPONENTS#* service}"

    AFTER="${TFS_COMPONENTS#* service}"

#    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"

    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"

#fi

fi





# Uncomment to activate Load Generator

# Uncomment to activate Load Generator

#export TFS_COMPONENTS="${TFS_COMPONENTS} load_generator"

#export TFS_COMPONENTS="${TFS_COMPONENTS} load_generator"
@@ -140,7 +140,7 @@ export CRDB_DEPLOY_MODE="single" 
export CRDB_DROP_DATABASE_IF_EXISTS=""

export CRDB_DROP_DATABASE_IF_EXISTS=""





# Disable flag for re-deploying CockroachDB from scratch.

# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY=""

export CRDB_REDEPLOY="YES"









# ----- NATS -------------------------------------------------------------------

# ----- NATS -------------------------------------------------------------------

src/service/Dockerfile

+3 −2
Original line number Original line Diff line number Diff line
@@ -32,8 +32,9 @@ RUN python3 -m pip install --upgrade pip 
RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade pip-tools

RUN python3 -m pip install --upgrade pip-tools





# Install Flask

# Install Flask globally

RUN python3 -m pip install Flask

RUN python3 -m pip install --upgrade pip

RUN python3 -m pip install flask





# Get common Python packages

# Get common Python packages

# Note: this step enables sharing the previous Docker build steps among all the Python components

# Note: this step enables sharing the previous Docker build steps among all the Python components

src/tests/tools/mock_qkd_nodes/start.sh

+5 −3
Original line number Original line Diff line number Diff line
@@ -15,14 +15,16 @@ 




cd "$(dirname "$0")"

cd "$(dirname "$0")"





# Ensure the local bin directory is in the PATH

export PATH=$PATH:/home/gitlab-runner/.local/bin



# Function to kill all background processes

# Function to kill all background processes

killbg() {

killbg() {

    for p in "${pids[@]}" ; do

    for p in "${pids[@]}" ; do

        kill "$p" 2>/dev/null

        kill "$p" 2>/dev/null;

    done

    done

}

}





# Trap exit and ensure cleanup of Flask processes

trap killbg EXIT

trap killbg EXIT

pids=()

pids=()