diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3192310a02cfc9998bfd6ad3111a3130d388522..dca5c08f596fa5f9e61627af7c4a1d285e464f7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -176,13 +176,27 @@ deploy prod beta: - echo ${CI_K8S_PROD_CONFIG} | base64 -d > ${KUBECONFIG} script: - helm dependency update ops/helm/nomad - - helm upgrade --install nomad-prod-test ops/helm/nomad -f ops/helm/nomad/deployments/prod-beta-values.yaml --set image.tag=$CI_COMMIT_REF_NAME,roll=true --wait + - helm upgrade --install nomad-beta ops/helm/nomad -f ops/helm/nomad/deployments/prod-beta-values.yaml --set image.tag=$CI_COMMIT_REF_NAME,roll=true --wait - docker pull $TEST_IMAGE - docker run -t -e NOMAD_KEYCLOAK_REALM_NAME=fairdi_nomad_prod $TEST_IMAGE python -m nomad.cli client -n https://nomad-lab.eu/prod/rae/beta/api -u test -w $CI_NOMAD_TEST_PASSWORD integrationtests --skip-publish --skip-doi except: - /^dev-.*$/ when: manual +deploy prod test: + stage: release + before_script: + - mkdir -p /etc/deploy + - echo ${CI_K8S_PROD_CONFIG} | base64 -d > ${KUBECONFIG} + script: + - helm dependency update ops/helm/nomad + - helm upgrade --install nomad-test ops/helm/nomad -f ops/helm/nomad/deployments/prod-test-values.yaml --set image.tag=$CI_COMMIT_REF_NAME,roll=true --wait + - docker pull $TEST_IMAGE + - docker run -t -e NOMAD_KEYCLOAK_REALM_NAME=fairdi_nomad_prod $TEST_IMAGE python -m nomad.cli client -n https://nomad-lab.eu/prod/rae/test/api -u test -w $CI_NOMAD_TEST_PASSWORD integrationtests --skip-publish --skip-doi + except: + - /^dev-.*$/ + when: manual + release latest image: stage: release script: diff --git a/ops/helm/nomad/deployments/prod-beta-values.yaml b/ops/helm/nomad/deployments/prod-beta-values.yaml index 12fd488b49bb51aa9e03cb640441282469f10b9a..35b6e01b505c8aaf03f764d759a24736946592d7 100644 --- a/ops/helm/nomad/deployments/prod-beta-values.yaml +++ b/ops/helm/nomad/deployments/prod-beta-values.yaml @@ -22,6 +22,9 @@ gui: encyclopediaEnabled: true aitoolkitEnabled: true +app: + replicas: 2 + worker: replicas: 1 routing: "queue" diff --git a/ops/helm/nomad/deployments/prod-test-values.yaml b/ops/helm/nomad/deployments/prod-test-values.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b11390b7fc91a3408b7830d5c02bac15498ce36c --- /dev/null +++ b/ops/helm/nomad/deployments/prod-test-values.yaml @@ -0,0 +1,69 @@ +version: + label: "v0.9.8" + isBeta: true + usesBetaData: false + officialUrl: "https://nomad-lab.eu/prod/rae/gui" + +image: + tag: "latest" + pullPolicy: "Always" + +proxy: + nodePort: 30014 + nodeIP: '130.183.207.81' + external: + host: "nomad-lab.eu" + path: "/prod/rae/test" + +gui: + debug: true + matomoEnabled: false + matomoSiteId: 2 + encyclopediaEnabled: true + aitoolkitEnabled: true + +app: + replicas: 1 + +worker: + replicas: 1 + routing: "queue" + processes: 10 + nomadNodeType: "prod-worker" + +elastic: + host: elasticsearch.elasticsearch.svc.cluster.local + port: 9200 + +mongo: + host: rs0/mongodb-0.mongo.mongodb.svc.cluster.local,mongodb-1.mongo.mongodb.svc.cluster.local,mongodb-2.mongo.mongodb.svc.cluster.local + +logstash: + host: logstash.elk.svc.cluster.local + +dbname: fairdi_nomad_test_v0_8 + +uploadurl: 'http://nomad-lab.eu/prod/rae/test/api/uploads' + +client: + passwordSecret: 'nomad-keycloak-password' + +keycloak: + serverUrl: "https://nomad-lab.eu/fairdi/keycloak/auth/" + passwordSecret: 'nomad-keycloak-password' + realmName: 'fairdi_nomad_prod' + clientId: 'nomad_public' + admin_user_id: '82efac55-6187-408c-8027-b98580c0e1c5' + +volumes: + prefixSize: 1 + public: /nomad/fairdi/test/fs/public + staging: /nomad/fairdi/test/fs/staging + tmp: /nomad/fairdi/test/fs/tmp + nomad: /nomad + +mail: + enabled: true + host: 'mailrelay.mpcdf.mpg.de' + port: 25 + from: 'webmaster@nomad-coe.eu' diff --git a/ops/helm/nomad/values.yaml b/ops/helm/nomad/values.yaml index b8386a24e13e718e0ce228bf0f5bc6478b59b3f3..61d26c45e7636248b401d61545cf4bb73958b065 100644 --- a/ops/helm/nomad/values.yaml +++ b/ops/helm/nomad/values.yaml @@ -140,7 +140,7 @@ kibana: host: nomad-flink-01.esc mail: - enabled: "false" + enabled: false host: 'localhost' port: 25 from: 'support@nomad-lab.eu'