Added prod test deploy and fixed beta deploy.

.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:

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"

ops/helm/nomad/deployments/prod-test-values.yaml

+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'

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'