Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
Jbrowse2 Annelids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arendt Group
Jbrowse2 Annelids
Commits
f8f3db6e
Commit
f8f3db6e
authored
10 months ago
by
Cyril Christophe Daniel Robert Cros
Browse files
Options
Downloads
Patches
Plain Diff
Altering ci to dev prod
parent
5fff2ac2
No related branches found
Branches containing commit
No related tags found
1 merge request
!3
Altering ci to dev prod
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+23
-8
23 additions, 8 deletions
.gitlab-ci.yml
deployment/jbrowse2-dep.yml
+10
-4
10 additions, 4 deletions
deployment/jbrowse2-dep.yml
with
33 additions
and
12 deletions
.gitlab-ci.yml
+
23
−
8
View file @
f8f3db6e
...
...
@@ -2,7 +2,9 @@
variables
:
S3_ENDPOINT
:
"
https://s3.embl.de"
S3_BUCKET
:
"
annelids"
JBROWSE_HOSTNAME
:
"
genomes.arendt.embl.de"
JBROWSE_HOSTNAME
:
"
genomes-dev.arendt.embl.de"
RELEASE_LABEL
:
"
dev"
INGRESS_CLASS
:
"
internal-users"
stages
:
-
access_test
...
...
@@ -13,9 +15,6 @@ stages:
s3_access_test
:
image
:
minio/mc
stage
:
access_test
rules
:
-
changes
:
# TODO change where necessary
-
image/*
before_script
:
-
mc alias set genomes $S3_ENDPOINT $S3_ACCESS_KEY $S3_SECRET_KEY
script
:
...
...
@@ -53,17 +52,24 @@ kustomize_build_apply:
-
envsubst < deployment/jbrowse2-dep.yml > deployment/jbrowse2-dep.yaml
-
cat deployment/jbrowse2-dep.yaml
-
kubectl apply -k deployment
-
kubectl -n $NS rollout restart deployment/jbrowse2
-
kubectl -n $NS rollout restart deployment/jbrowse2
-$RELEASE_LABEL
-
kubectl -n $NS wait --for=condition=available
--timeout=60s deploy/jbrowse2
-
kubectl -n $NS rollout status deployment/jbrowse2
--timeout=60s deploy/jbrowse2
-$RELEASE_LABEL
-
kubectl -n $NS rollout status deployment/jbrowse2
-$RELEASE_LABEL
dependencies
:
-
cluster_access_test
-
build_nginx_with_jbrowse_config_file
rules
:
-
when
:
always
-
if
:
$CI_COMMIT_REF_NAME == "main"
variables
:
JBROWSE_HOSTNAME
:
"
genomes.arendt.embl.de"
RELEASE_LABEL
:
"
prod"
INGRESS_CLASS
:
"
external-users"
clean_up_k8s_deployment
:
image
:
dtzar/helm-kubectl:3.8.2
stage
:
clean_up_on_failure
when
:
on_failure
before_script
:
-
echo $KUBECONFIG | base64 -d > /tmp/kubeconf
-
export KUBECONFIG=/tmp/kubeconf
...
...
@@ -71,3 +77,12 @@ clean_up_k8s_deployment:
-
echo 'Failed job, deleting resources'
-
envsubst < deployment/jbrowse2-dep.yml > deployment/jbrowse2-dep.yaml
-
kubectl delete -k deployment
dependencies
:
-
kustomize_build_apply
rules
:
-
when
:
on_failure
-
if
:
$CI_COMMIT_REF_NAME == "main"
variables
:
JBROWSE_HOSTNAME
:
"
genomes.arendt.embl.de"
RELEASE_LABEL
:
"
prod"
INGRESS_CLASS
:
"
external-users"
This diff is collapsed.
Click to expand it.
deployment/jbrowse2-dep.yml
+
10
−
4
View file @
f8f3db6e
...
...
@@ -2,19 +2,22 @@
apiVersion
:
apps/v1
kind
:
Deployment
metadata
:
name
:
jbrowse2
name
:
jbrowse2
-${RELEASE_LABEL}
namespace
:
${NS}
labels
:
name
:
jbrowse2
environment
:
${RELEASE_LABEL}
spec
:
replicas
:
1
selector
:
matchLabels
:
app
:
jbrowse2
environment
:
${RELEASE_LABEL}
template
:
metadata
:
labels
:
app
:
jbrowse2
environment
:
${RELEASE_LABEL}
spec
:
imagePullSecrets
:
-
name
:
gitlab-token-auth
...
...
@@ -37,11 +40,12 @@ spec:
apiVersion
:
v1
kind
:
Service
metadata
:
name
:
jbrowse2
name
:
jbrowse2
-${RELEASE_LABEL}
namespace
:
${NS}
spec
:
selector
:
app
:
jbrowse2
environment
:
${RELEASE_LABEL}
ports
:
-
name
:
http
protocol
:
TCP
...
...
@@ -51,12 +55,14 @@ spec:
apiVersion
:
networking.k8s.io/v1
kind
:
Ingress
metadata
:
name
:
jbrowse2
name
:
jbrowse2
-${RELEASE_LABEL}
namespace
:
${NS}
annotations
:
traefik.ingress.kubernetes.io/router.tls.certresolver
:
sectigo
labels
:
environment
:
${RELEASE_LABEL}
spec
:
ingressClassName
:
external-users
ingressClassName
:
${INGRESS_CLASS}
rules
:
-
host
:
${JBROWSE_HOSTNAME}
http
:
...
...
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