Update to version 2.7.0

CSCfi · Feb 1, 2022 · c8d7f1d · c8d7f1d
1 parent 563136f
commit c8d7f1d
Show file tree

Hide file tree

Showing 66 changed files with 3,343 additions and 607 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -15,21 +15,21 @@ deploy:
   stage: deploy
   environment: $CI_COMMIT_REF_NAME
   script:
-    - ansible-playbook -i $ANSIBLE_INVENTORY $DEPLOY_PLAYBOOK -e "build_id=$CI_COMMIT_SHORT_SHA repo_version=$CI_COMMIT_REF_NAME"
+    - ansible-playbook -i $ANSIBLE_INVENTORY $DEPLOY_PLAYBOOK -e "build_id=$CI_COMMIT_REF_SLUG repo_version=$CI_COMMIT_REF_NAME"
 
 integration_test:
   stage: test
   environment: $CI_COMMIT_REF_NAME
   script:
-    - ansible-playbook -i $ANSIBLE_INVENTORY $TEST_PLAYBOOK -e "build_id=$CI_COMMIT_SHORT_SHA"
+    - ansible-playbook -i $ANSIBLE_INVENTORY $TEST_PLAYBOOK -e "build_id=$CI_COMMIT_REF_SLUG repo_version=$CI_COMMIT_REF_NAME"
 
 clean_test:
   stage: clean_test
   environment:
     name: $CI_COMMIT_REF_NAME
     on_stop: clean_gitlab_env
   script:
-    - ansible-playbook -i $ANSIBLE_INVENTORY $DELETE_PLAYBOOK -e "build_id=$CI_COMMIT_SHORT_SHA"
+    - ansible-playbook -i $ANSIBLE_INVENTORY $DELETE_PLAYBOOK -e "build_id=$CI_COMMIT_REF_SLUG repo_version=$CI_COMMIT_REF_NAME"
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: always
@@ -53,8 +53,8 @@ update_metax:
   stage: update
   environment: $CI_COMMIT_REF_NAME
   script:
-    - ansible-playbook -i $ANSIBLE_INVENTORY $UPDATE_PROXY_PLAYBOOK -e "build_id=$CI_COMMIT_SHORT_SHA"
-    - ansible-playbook -i $ANSIBLE_INVENTORY $MANAGE_PLAYBOOK -e "build_id=$CI_COMMIT_SHORT_SHA"
+    - ansible-playbook -i $ANSIBLE_INVENTORY $UPDATE_PROXY_PLAYBOOK -e "build_id=$CI_COMMIT_REF_SLUG repo_version=$CI_COMMIT_REF_NAME"
+    - ansible-playbook -i $ANSIBLE_INVENTORY $MANAGE_PLAYBOOK -e "build_id=$CI_COMMIT_REF_SLUG repo_version=$CI_COMMIT_REF_NAME"
   rules:
     - if: $CI_COMMIT_BRANCH =~ /^(demo|stable|staging|test)$/
       when: always
@@ -64,8 +64,8 @@ clean_previous_build:
   stage: clean_build
   environment: $CI_COMMIT_REF_NAME
   script:
-    - ansible-playbook -i $ANSIBLE_INVENTORY $DELETE_PLAYBOOK -e "build_id=${CI_COMMIT_BEFORE_SHA:0:8}"
+    - ansible-playbook -i $ANSIBLE_INVENTORY $DELETE_PLAYBOOK -e "build_id=$CI_COMMIT_REF_SLUG repo_version=$CI_COMMIT_REF_NAME"
   rules:
     - if: $CI_COMMIT_BRANCH =~ /^(demo|stable|staging|test)$/
-      when: always
+      when: manual
     - when: never
diff --git a/ENV_VARS.md b/ENV_VARS.md
@@ -56,6 +56,7 @@ copy .env.template to .env and fill the required values from below table. Requir
 | REMS_FORM_ID                            | no       |                                                                                       | Required if REMS is enabled                                                                                |
 | REMS_METAX_USER                         | no       |                                                                                       | Required if REMS is enabled                                                                                |
 | REMS_REPORTER_USER                      | no       |                                                                                       | Required if REMS is enabled                                                                                |
+| REMS_ORGANIZATION                       | no       |                                                                                       | Required if REMS is enabled                                                                                |
 | SERVER_DOMAIN_NAME                      | no       | metax.fd-dev.csc.fi                                                                   |
 | ENABLE_V1_ENDPOINTS                     | no       | True
 | ENABLE_V2_ENDPOINTS                     | no       | True

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,6 +51,8 @@ services:
   metax-rabbitmq:
     image: rabbitmq:3-management
     hostname: metax-rabbitmq
+    ports:
+      - 8050:15672
     volumes:
       - metax-rabbitmq:/var/lib/rabbitmq