diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e6fbeb9d82091b221ab536031b0589dc47ad12a..f3acc1faabc58183406e779a9b70da4e8a1e4a08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -363,6 +363,7 @@ deploy prod develop: needs: - job: build rules: + - if: $CI_COMMIT_BRANCH == "develop" - when: manual allow_failure: true @@ -410,6 +411,7 @@ python package: - when: manual allow_failure: true + pypi package: stage: release variables: diff --git a/ops/kubernetes/deployments/prod-develop-values.yaml b/ops/kubernetes/deployments/prod-develop-values.yaml index 8ab6dca5b626d6b1e3ab788e750a823404f7c636..0a16fdf02786d36bb7cc555076d782a179f9929c 100644 --- a/ops/kubernetes/deployments/prod-develop-values.yaml +++ b/ops/kubernetes/deployments/prod-develop-values.yaml @@ -5,7 +5,7 @@ version: officialUrl: "https://nomad-lab.eu/prod/v1/gui" image: - tag: "latest" + tag: "develop" pullPolicy: "Always" proxy: @@ -23,12 +23,13 @@ gui: aitoolkitEnabled: false app: - replicas: 1 - worker: 2 + replicas: 2 + worker: 4 + threads: 4 nomadNodeType: "public" worker: - replicas: 1 + replicas: 2 routing: "queue" processes: 12 nomadNodeType: "prod-worker" @@ -43,7 +44,7 @@ mongo: logstash: host: logstash.elk.svc.cluster.local -dbname: nomad_develop_v1 +dbname: nomad_prod_v1 uploadurl: "https://nomad-lab.eu/prod/v1/develop/api/uploads" @@ -60,10 +61,10 @@ keycloak: volumes: prefixSize: 1 - public: /nomad/fairdi/develop/fs/public - staging: /nomad/fairdi/develop/fs/staging - north_home: /nomad/fairdi/develop/fs/north/users - tmp: /nomad/fairdi/develop/fs/tmp + public: /nomad/fairdi/prod/fs/public + staging: /nomad/fairdi/prod/fs/staging + north_home: /nomad/fairdi/prod/fs/north/users + tmp: /nomad/fairdi/prod/fs/tmp nomad: /nomad archiveVersionSuffix: v1 @@ -75,7 +76,7 @@ mail: datacite: secret: "nomad-datacite" - enabled: false + enabled: true north: enabled: true @@ -98,4 +99,3 @@ jupyterhub: userdata_url: https://nomad-lab.eu/fairdi/keycloak/auth/realms/fairdi_nomad_prod/protocol/openid-connect/userinfo singleuser: podNameTemplate: "nomad-develop-v1-north-{username}--{servername}" - diff --git a/ops/kubernetes/deployments/prod-staging-values.yaml b/ops/kubernetes/deployments/prod-staging-values.yaml index cf2dd434cbb68e3c50dd1a6748d710ad234af727..6675340bcf12abae3787b473cf985ce9331d16b1 100644 --- a/ops/kubernetes/deployments/prod-staging-values.yaml +++ b/ops/kubernetes/deployments/prod-staging-values.yaml @@ -26,7 +26,6 @@ app: replicas: 4 worker: 4 threads: 4 - workerClass: "gthread" nomadNodeType: "public" worker: @@ -100,5 +99,3 @@ jupyterhub: userdata_url: https://nomad-lab.eu/fairdi/keycloak/auth/realms/fairdi_nomad_prod/protocol/openid-connect/userinfo singleuser: podNameTemplate: "nomad-staging-v1-north-{username}--{servername}" - -