Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Script recalcul calque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ERASME
Script recalcul calque
Commits
3c5ee5d7
Commit
3c5ee5d7
authored
2 years ago
by
Pierre-Gilles Levallois
Browse files
Options
Downloads
Patches
Plain Diff
Refactoring stage name because Openshift does not allow UPPERCASE in subdomain names.
parent
1e2951cb
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!6
Fully functional version that calculate layer with all stages
Pipeline
#54791
passed
2 years ago
Stage: Build Calqul
Stage: Deploy Calqul Buttons
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+4
-4
4 additions, 4 deletions
.gitlab-ci.yml
Dockerfiles/python/scripts/launch.sh
+7
-7
7 additions, 7 deletions
Dockerfiles/python/scripts/launch.sh
with
11 additions
and
11 deletions
.gitlab-ci.yml
+
4
−
4
View file @
3c5ee5d7
...
@@ -215,7 +215,7 @@ Build Calqul Git-lfs:
...
@@ -215,7 +215,7 @@ Build Calqul Git-lfs:
environment
:
dev
environment
:
dev
variables
:
variables
:
NAMESPACE
:
"
ns-$TRIGRAMME-$NAMESPACE_ENV"
NAMESPACE
:
"
ns-$TRIGRAMME-$NAMESPACE_ENV"
CALQUL_ACTION
:
"
init
D
atas"
CALQUL_ACTION
:
"
init
-d
atas"
before_script
:
before_script
:
-
*prepare_deployment
-
*prepare_deployment
script
:
script
:
...
@@ -231,7 +231,7 @@ Build Calqul Git-lfs:
...
@@ -231,7 +231,7 @@ Build Calqul Git-lfs:
environment
:
dev
environment
:
dev
variables
:
variables
:
NAMESPACE
:
"
ns-$TRIGRAMME-$NAMESPACE_ENV"
NAMESPACE
:
"
ns-$TRIGRAMME-$NAMESPACE_ENV"
CALQUL_ACTION
:
"
compute
F
actors"
CALQUL_ACTION
:
"
compute
-f
actors"
before_script
:
before_script
:
-
*prepare_deployment
-
*prepare_deployment
script
:
script
:
...
@@ -247,7 +247,7 @@ Build Calqul Git-lfs:
...
@@ -247,7 +247,7 @@ Build Calqul Git-lfs:
environment
:
dev
environment
:
dev
variables
:
variables
:
NAMESPACE
:
"
ns-$TRIGRAMME-$NAMESPACE_ENV"
NAMESPACE
:
"
ns-$TRIGRAMME-$NAMESPACE_ENV"
CALQUL_ACTION
:
"
compute
I
ndices"
CALQUL_ACTION
:
"
compute
-i
ndices"
before_script
:
before_script
:
-
*prepare_deployment
-
*prepare_deployment
script
:
script
:
...
@@ -263,7 +263,7 @@ Build Calqul Git-lfs:
...
@@ -263,7 +263,7 @@ Build Calqul Git-lfs:
environment
:
dev
environment
:
dev
variables
:
variables
:
NAMESPACE
:
"
ns-$TRIGRAMME-$NAMESPACE_ENV"
NAMESPACE
:
"
ns-$TRIGRAMME-$NAMESPACE_ENV"
CALQUL_ACTION
:
"
dump
D
atas"
CALQUL_ACTION
:
"
dump
-d
atas"
before_script
:
before_script
:
-
*prepare_deployment
-
*prepare_deployment
script
:
script
:
...
...
This diff is collapsed.
Click to expand it.
Dockerfiles/python/scripts/launch.sh
+
7
−
7
View file @
3c5ee5d7
...
@@ -54,7 +54,7 @@ comment () {
...
@@ -54,7 +54,7 @@ comment () {
# Usage
# Usage
usage
()
{
usage
()
{
comment
"
$0
[init
D
atas|compute
F
actors|compute
I
ndices|dump
D
atas|all]
$namespace_env
$DB_HOST
$DB_PORT
$DB_NAME
$DB_USER
"
comment
"
$0
[init
-d
atas|compute
-f
actors|compute
-i
ndices|dump
-d
atas|all]
$namespace_env
$DB_HOST
$DB_PORT
$DB_NAME
$DB_USER
"
}
}
# Check the last command return code (must be insterted just after the commend )
# Check the last command return code (must be insterted just after the commend )
...
@@ -98,7 +98,7 @@ python3 main.py displayEnv
...
@@ -98,7 +98,7 @@ python3 main.py displayEnv
comment
"Checking action to do : "
comment
"Checking action to do : "
case
"
$action
"
in
case
"
$action
"
in
"init
D
atas"
|
"compute
F
actors"
|
"compute
I
ndices"
|
"dump
D
atas"
|
"all"
)
"init
-d
atas"
|
"compute
-f
actors"
|
"compute
-i
ndices"
|
"dump
-d
atas"
|
"all"
)
comment
"Action is '
$action
'."
comment
"Action is '
$action
'."
check
check
;;
;;
...
@@ -109,13 +109,13 @@ case "$action" in
...
@@ -109,13 +109,13 @@ case "$action" in
;;
;;
esac
esac
if
[
$action
==
"init
D
atas"
]
||
[
$action
==
"all"
]
;
then
if
[
$action
==
"init
-d
atas"
]
||
[
$action
==
"all"
]
;
then
stage
"
I
nit
D
atas"
stage
"
i
nit
-d
atas"
python3 main.py initDatas
python3 main.py initDatas
check
check
fi
fi
if
[
$action
==
"compute
F
actors"
]
||
[
$action
==
"all"
]
;
then
if
[
$action
==
"compute
-f
actors"
]
||
[
$action
==
"all"
]
;
then
stage
"Compute Factors & Indices"
stage
"Compute Factors & Indices"
for
NOM_COMMUNE
in
$(
echo
"
${
!LISTE_COMMUNES[@]
}
"
|
tr
' '
'\n'
|
sort
)
;
do
for
NOM_COMMUNE
in
$(
echo
"
${
!LISTE_COMMUNES[@]
}
"
|
tr
' '
'\n'
|
sort
)
;
do
CODE_INSEE
=
${
LISTE_COMMUNES
[
$NOM_COMMUNE
]
}
CODE_INSEE
=
${
LISTE_COMMUNES
[
$NOM_COMMUNE
]
}
...
@@ -125,7 +125,7 @@ if [ $action == "computeFactors" ] || [ $action == "all" ]; then
...
@@ -125,7 +125,7 @@ if [ $action == "computeFactors" ] || [ $action == "all" ]; then
done
done
fi
fi
if
[
$action
==
"compute
I
ndices"
]
||
[
$action
==
"all"
]
;
then
if
[
$action
==
"compute
-i
ndices"
]
||
[
$action
==
"all"
]
;
then
stage
"Compute Indices"
stage
"Compute Indices"
python3 main.py computeIndices
python3 main.py computeIndices
check
check
...
@@ -134,7 +134,7 @@ fi
...
@@ -134,7 +134,7 @@ fi
# Launching everything, it is possible to give a list of townships
# Launching everything, it is possible to give a list of townships
# python3 main.py computeAll
# python3 main.py computeAll
if
[
$action
==
"dump
D
atas"
]
||
[
$action
==
"all"
]
;
then
if
[
$action
==
"dump
-d
atas"
]
||
[
$action
==
"all"
]
;
then
stage
"Dumping result database"
stage
"Dumping result database"
#
#
# Option "--no-password" is set not to have to provide password by prompt.
# Option "--no-password" is set not to have to provide password by prompt.
...
...
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