Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TFS
controller
Commits
5d6234cd
Commit
5d6234cd
authored
6 months ago
by
Alberto Gonzalez Barneo
Browse files
Options
Downloads
Patches
Plain Diff
Added flask dependency
parent
3f755fa6
No related branches found
No related tags found
1 merge request
!273
Draft: Resolve "(OPT) Integrate QKD tests in TFS CI/CD pipeline"
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
my_deploy.sh
+6
-6
6 additions, 6 deletions
my_deploy.sh
src/service/Dockerfile
+3
-2
3 additions, 2 deletions
src/service/Dockerfile
src/tests/tools/mock_qkd_nodes/start.sh
+5
-3
5 additions, 3 deletions
src/tests/tools/mock_qkd_nodes/start.sh
with
14 additions
and
11 deletions
my_deploy.sh
+
6
−
6
View file @
5d6234cd
...
...
@@ -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
# 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.
#
if [[ "$TFS_COMPONENTS" == *"service"* ]]; then
#
BEFORE="${TFS_COMPONENTS% service*}"
#
AFTER="${TFS_COMPONENTS#* service}"
#
export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"
#
fi
if
[[
"
$TFS_COMPONENTS
"
==
*
"service"
*
]]
;
then
BEFORE
=
"
${
TFS_COMPONENTS
% service*
}
"
AFTER
=
"
${
TFS_COMPONENTS
#* service
}
"
export
TFS_COMPONENTS
=
"
${
BEFORE
}
qkd_app service
${
AFTER
}
"
fi
# Uncomment to activate Load Generator
#export TFS_COMPONENTS="${TFS_COMPONENTS} load_generator"
...
...
@@ -140,7 +140,7 @@ export CRDB_DEPLOY_MODE="single"
export
CRDB_DROP_DATABASE_IF_EXISTS
=
""
# Disable flag for re-deploying CockroachDB from scratch.
export
CRDB_REDEPLOY
=
""
export
CRDB_REDEPLOY
=
"
YES
"
# ----- NATS -------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
src/service/Dockerfile
+
3
−
2
View file @
5d6234cd
...
...
@@ -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
pip-tools
# Install Flask
RUN
python3
-m
pip
install
Flask
# Install Flask globally
RUN
python3
-m
pip
install
--upgrade
pip
RUN
python3
-m
pip
install
flask
# Get common Python packages
# Note: this step enables sharing the previous Docker build steps among all the Python components
...
...
This diff is collapsed.
Click to expand it.
src/tests/tools/mock_qkd_nodes/start.sh
+
5
−
3
View file @
5d6234cd
...
...
@@ -15,14 +15,16 @@
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
killbg
()
{
for
p
in
"
${
pids
[@]
}
"
;
do
kill
"
$p
"
2>/dev/null
for
p
in
"
${
pids
[@]
}
"
;
do
kill
"
$p
"
2>/dev/null
;
done
}
# Trap exit and ensure cleanup of Flask processes
trap
killbg EXIT
pids
=()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment