Merge pull request #2704 from uselagoon/active_standby_test

add back active-standby tests to controller-kubernetes

Makefile

@@ -954,7 +954,7 @@ KIND_VERSION = v0.11.1
 GOJQ_VERSION = v0.12.3
 CHART_TESTING_VERSION = v3.4.0
 KIND_IMAGE = kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
-TESTS = [api,features-kubernetes,features-kubernetes-2,nginx,drupal-php73,drupal-php74,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch]
+TESTS = [api,features-kubernetes,features-kubernetes-2,active-standby-kubernetes,nginx,drupal-php73,drupal-php74,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch]
 CHARTS_TREEISH = main
 
 local-dev/kind:

tests/tasks/api/add-project.gql

@@ -4,7 +4,8 @@ mutation addProject {
       name: "{{ project }}"
       openshift: 2001
       gitUrl: "{{ git_url }}"
-      productionEnvironment: "master"
+      productionEnvironment: "{{ prodenv }}"
+      standbyProductionEnvironment: "{{ standbyenv }}"
       subfolder: "{{ subfolder }}"
       privateKey: "-----BEGIN RSA PRIVATE KEY-----\n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\n-----END RSA PRIVATE KEY-----"
     }

tests/tests/active-standby-kubernetes.yaml

@@ -5,11 +5,23 @@
   vars:
     testname: "API TOKEN"
 
+- include: api/add-project.yaml
+  vars:
+    project: ci-active-standby-{{ cluster_type }}
+    git_repo_name: active-standby.git
+    git_url: "{{ localgit_url }}/{{ git_repo_name }}"
+    prod_env: master-a
+    standby_env: master-b
+
 - include: active-standby/active-standby.yaml
   vars:
     testname: "ACTIVE_STANDBY"
     git_repo_name: active-standby.git
     project: ci-active-standby-{{ cluster_type }}
-    branch: master-a
+    prod_branch: master-a
     standby_branch: master-b
-    error_code_check: 404
+    error_code_check: 404
+
+- include: api/delete-project.yaml
+  vars:
+    project: ci-active-standby-{{ cluster_type }}

tests/tests/active-standby/active-standby.yaml

@@ -4,6 +4,7 @@
   serial: 1
   vars:
     git_files: "active-standby/first/"
+    branch: "{{ prod_branch }}"
   tasks:
   - include: ../../tasks/git-init.yaml
   - include: ../../tasks/git-add-commit-push.yaml
@@ -12,7 +13,7 @@
   hosts: localhost
   serial: 1
   vars:
-    branch: "{{ branch }}"
+    branch: "{{ prod_branch }}"
     project: "{{ project }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
@@ -22,21 +23,22 @@
   serial: 1
   vars:
     git_files: "active-standby/second/"
+    branch: "{{ standby_branch }}"
   tasks:
   - include: git-add-commit-push.yaml
 
-- name: "{{ testname }} - standby branch api deployEnvironmentBranch on {{ project }}, which should deploy the first commit"
+- name: "{{ testname }} - standby branch api deployEnvironmentBranch {{ standby_branch }} on {{ project }}, which should deploy the first commit"
   hosts: localhost
   serial: 1
   vars:
+    branch: "{{ standby_branch }}"
     project: "{{ project }}"
   tasks:
-  - include: deploy-no-sha.yaml
+  - include: ../../tasks/api/deploy-no-sha.yaml
 
 - include: pre-switch-check.yaml
   vars:
     expected_head: "{{ current_head }}"
-    expected_branch: "{{ branch }}"
     project: "{{ project }}"
 
 - name: "{{ testname }} - api switchActiveStandby on {{ project }}, which should switch the routes"
@@ -50,37 +52,36 @@
 - include: post-switch-check.yaml
   vars:
     expected_head: "{{ current_head }}"
-    expected_branch: "{{ branch }}"
     project: "{{ project }}"
 
-- name: "{{ testname }} - active branch api deleteEnvironment on {{ project }}, which should remove all resources"
+- name: "{{ testname }} - api deleteEnvironment {{ prod_branch }} on {{ project }}, which should remove all resources"
   hosts: localhost
   serial: 1
   vars:
     project: "{{ project }}"
-    branch: "{{ branch }}"
+    branch: "{{ prod_branch }}"
   tasks:
   - include: ../../tasks/api/delete-environment.yaml
 
-- name: "{{ testname }} - standby branch api deleteEnvironment on {{ project }}, which should remove all resources"
+- name: "{{ testname }} - check if {{ prod_branch }} for {{ project }} does not exist anymore"
   hosts: localhost
   serial: 1
   vars:
-    project: "{{ project }}"
-    # branch: "{{ standby_branch }}"
+    url: "http://nginx.{{ project | regex_replace('_', '-') }}.{{ prod_branch | regex_replace('/', '-') }}.{{ route_suffix }}"
+    expected_returncode: "{{ error_code_check }}"
   tasks:
-  - include: remove.yaml
+  - include: ../../checks/check-url-returncode.yaml
 
-- name: "{{ testname }} - active branch check if site for {{ project }} does not exist anymore"
+- name: "{{ testname }} - api deleteEnvironment {{ standby_branch }} on {{ project }}, which should remove all resources"
   hosts: localhost
   serial: 1
   vars:
-    url: "http://nginx.{{ project | regex_replace('_', '-') }}.{{ branch | regex_replace('/', '-') }}.{{ route_suffix }}"
-    expected_returncode: "{{ error_code_check }}"
+    project: "{{ project }}"
+    branch: "{{ standby_branch }}"
   tasks:
-  - include: ../../checks/check-url-returncode.yaml
+  - include: ../../tasks/api/delete-environment.yaml
 
-- name: "{{ testname }} - standby branch check if site for {{ project }} does not exist anymore"
+- name: "{{ testname }} - check if {{ standby_branch }} for {{ project }} does not exist anymore"
   hosts: localhost
   serial: 1
   vars:

tests/tests/active-standby/deploy-active-standby.yaml

@@ -39,6 +39,6 @@
         body_format: json
         body: '{ "query": "query($projectName: String!) {projectByName(name:$projectName){productionEnvironment,standbyProductionEnvironment}}", "variables": {"projectName":"{{ project }}"}}'
       register: switchresult
-      until: switchresult.json.data.projectByName.productionEnvironment == standby_branch or switchresult.json.data.projectByName.standbyProductionEnvironment == branch
+      until: switchresult.json.data.projectByName.productionEnvironment == standby_branch or switchresult.json.data.projectByName.standbyProductionEnvironment == prod_branch
       retries: 30
       delay: 10

tests/tests/active-standby/post-switch-check.yaml

@@ -1,13 +1,13 @@
-- name: "{{ testname }} - check if {{ project }} is deployed with searching for 'Hello World!'"
+- name: "{{ testname }} - check if {{ project }} is deployed with searching for 'Hello World!' on {{ prod_branch }}"
   hosts: localhost
   serial: 1
   vars:
-    url: "http://nginx.{{ project | regex_replace('_', '-') }}.{{ branch | regex_replace('/', '-') }}.{{ route_suffix }}"
+    url: "http://nginx.{{ project | regex_replace('_', '-') }}.{{ prod_branch | regex_replace('/', '-') }}.{{ route_suffix }}"
     expected_content: "Hello World!"
   tasks:
   - include: ../../checks/check-url-content.yaml
 
-- name: "{{ testname }} - check if {{ project }} is deployed with searching for 'Standby Hello World!'"
+- name: "{{ testname }} - check if {{ project }} is deployed with searching for 'Standby Hello World!' on {{ standby_branch }}"
   hosts: localhost
   serial: 1
   vars:
@@ -20,7 +20,7 @@
   hosts: localhost
   serial: 1
   vars:
-    url: "https://nginx.{{ project | regex_replace('_', '-') }}.{{ branch | regex_replace('/', '-') }}.{{ route_suffix_https }}"
+    url: "https://nginx.{{ project | regex_replace('_', '-') }}.{{ prod_branch | regex_replace('/', '-') }}.{{ route_suffix_https }}"
     host: "active-moving-route.com"
     expected_content: "Standby Hello World!"
   tasks:

tests/tests/active-standby/pre-switch-check.yaml

@@ -1,13 +1,13 @@
-- name: "{{ testname }} - check if {{ project }} is deployed with searching for 'Hello World!'"
+- name: "{{ testname }} - check if {{ project }} is deployed with searching for 'Hello World!' on {{ prod_branch }}"
   hosts: localhost
   serial: 1
   vars:
-    url: "http://nginx.{{ project | regex_replace('_', '-') }}.{{ branch | regex_replace('/', '-') }}.{{ route_suffix }}"
+    url: "http://nginx.{{ project | regex_replace('_', '-') }}.{{ prod_branch | regex_replace('/', '-') }}.{{ route_suffix }}"
     expected_content: "Hello World!"
   tasks:
   - include: ../../checks/check-url-content.yaml
 
-- name: "{{ testname }} - check if {{ project }} is deployed with searching for 'Standby Hello World!'"
+- name: "{{ testname }} - check if {{ project }} is deployed with searching for 'Standby Hello World!' on {{ standby_branch }}"
   hosts: localhost
   serial: 1
   vars:
@@ -20,7 +20,7 @@
   hosts: localhost
   serial: 1
   vars:
-    url: "https://nginx.{{ project | regex_replace('_', '-') }}.{{ branch | regex_replace('/', '-') }}.{{ route_suffix_https }}"
+    url: "https://nginx.{{ project | regex_replace('_', '-') }}.{{ prod_branch | regex_replace('/', '-') }}.{{ route_suffix_https }}"
     host: "active-moving-route.com"
     expected_content: "Hello World!"
   tasks:

tests/tests/api/add-project.yaml

@@ -6,6 +6,8 @@
     project: "{{ project }}"
     git_url: "{{ git_url }}"
     subfolder: "{{ sub_folder | default('') }}"
+    prodenv: "{{ prod_env | default('master') }}"
+    standbyenv: "{{ standby_env | default('') }}"
     openshift: 2001
   tasks:
   - include: ../../tasks/api/add-project.yaml