implement kubectl check for lagoon-build and add more tests

local-dev/git/Dockerfile

@@ -46,7 +46,8 @@ RUN mkdir -m 700 /git/.ssh && \
 	git --bare init /git/python.git && \
 	git --bare init /git/node-mongodb.git && \
 	git --bare init /git/tasks.git && \
-	git --bare init /git/image-cache.git
+	git --bare init /git/image-cache.git && \
+	git --bare init /git/generic.git
 
 USER root
 

local-dev/git/entrypoint.sh

@@ -4,4 +4,6 @@ if [ "$GIT_AUTHORIZED_KEYS" ]; then
   echo -e "$GIT_AUTHORIZED_KEYS" > /git/.ssh/authorized_keys
 fi
 
+ls -d -- git/*
+
 exec /sbin/runsvdir /etc/service

tests/Dockerfile

@@ -23,9 +23,10 @@ RUN apk add --no-cache --virtual .build-deps \
       PyJWT==2.3.* \
       requests==2.26.* \
       jmespath==0.10.* \
+      kubernetes==21.7.* \
     && apk del .build-deps
 
-RUN ansible-galaxy collection install ansible.posix community.general
+RUN ansible-galaxy collection install ansible.posix community.general kubernetes.core
 
 # download, extract and install kubectl binary
 # https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#downloads-for-v1204

tests/files/generic/GENERIC_FILES.md

@@ -0,0 +1 @@
+# Copy the project to deploy into this folder

tests/tasks/api/deploy-no-sha.yaml

@@ -22,6 +22,41 @@
     - fail:
         msg: "unsuccessful deploy"
       when: apiresponse.json.data.deployEnvironmentBranch != "success"
+    - name: Get the build pod name
+      kubernetes.core.k8s_info:
+        kind: Pod
+        wait: yes
+        namespace: "{{ namespace }}"
+        label_selectors:
+          - lagoon.sh/jobType = build
+        field_selectors:
+          - status.phase=Running
+        wait_sleep: 1
+        wait_timeout: 60
+      register: build_pod
+    - name: Print build_pod
+      ansible.builtin.debug:
+        msg: "build_pod: {{ build_pod.resources[0].metadata.name }} {{ build_pod.resources[0].status.phase }}"
+    - name: Wait until the build pod is completed
+      kubernetes.core.k8s_info:
+        kind: Pod
+        wait: yes
+        name: "{{ build_pod.resources[0].metadata.name }}"
+        namespace: "{{ namespace }}"
+        label_selectors:
+          - lagoon.sh/jobType = build
+        field_selectors:
+          - status.phase=Succeeded
+        wait_condition:
+          type: Ready
+          reason: PodCompleted
+          status: "False"
+        wait_sleep: 10
+        wait_timeout: 600
+      register: build_complete
+    - name: Print build_complete
+      ansible.builtin.debug:
+        msg: "build_complete: {{ build_complete.resources[0].metadata.name }} {{ build_complete.resources[0].status.phase }}"
     - name: "Set the retry count back to 0 when successful"
       set_fact:
         retry_count: 0

tests/tasks/api/deploy-pullrequest.yaml

@@ -22,6 +22,41 @@
     - fail:
         msg: "unsuccessful deploy"
       when: apiresponse.json.data.deployEnvironmentPullrequest != "success"
+    - name: Get the build pod name
+      kubernetes.core.k8s_info:
+        kind: Pod
+        wait: yes
+        namespace: "{{ namespace }}"
+        label_selectors:
+          - lagoon.sh/jobType = build
+        field_selectors:
+          - status.phase=Running
+        wait_sleep: 1
+        wait_timeout: 60
+      register: build_pod
+    - name: Print build_pod
+      ansible.builtin.debug:
+        msg: "build_pod: {{ build_pod.resources[0].metadata.name }} {{ build_pod.resources[0].status.phase }}"
+    - name: Wait until the build pod is completed
+      kubernetes.core.k8s_info:
+        kind: Pod
+        wait: yes
+        name: "{{ build_pod.resources[0].metadata.name }}"
+        namespace: "{{ namespace }}"
+        label_selectors:
+          - lagoon.sh/jobType = build
+        field_selectors:
+          - status.phase=Succeeded
+        wait_condition:
+          type: Ready
+          reason: PodCompleted
+          status: "False"
+        wait_sleep: 10
+        wait_timeout: 600
+      register: build_complete
+    - name: Print build_complete
+      ansible.builtin.debug:
+        msg: "build_complete: {{ build_complete.resources[0].metadata.name }} {{ build_complete.resources[0].status.phase }}"
     - name: "Set the retry count back to 0 when successful"
       set_fact:
         retry_count: 0

tests/tasks/api/deploy-sha.yaml

@@ -22,6 +22,41 @@
     - fail:
         msg: "unsuccessful deploy"
       when: apiresponse.json.data.deployEnvironmentBranch != "success"
+    - name: Get the build pod name
+      kubernetes.core.k8s_info:
+        kind: Pod
+        wait: yes
+        namespace: "{{ namespace }}"
+        label_selectors:
+          - lagoon.sh/jobType = build
+        field_selectors:
+          - status.phase=Running
+        wait_sleep: 1
+        wait_timeout: 60
+      register: build_pod
+    - name: Print build_pod
+      ansible.builtin.debug:
+        msg: "build_pod: {{ build_pod.resources[0].metadata.name }} {{ build_pod.resources[0].status.phase }}"
+    - name: Wait until the build pod is completed
+      kubernetes.core.k8s_info:
+        kind: Pod
+        wait: yes
+        name: "{{ build_pod.resources[0].metadata.name }}"
+        namespace: "{{ namespace }}"
+        label_selectors:
+          - lagoon.sh/jobType = build
+        field_selectors:
+          - status.phase=Succeeded
+        wait_condition:
+          type: Ready
+          reason: PodCompleted
+          status: "False"
+        wait_sleep: 10
+        wait_timeout: 600
+      register: build_complete
+    - name: Print build_complete
+      ansible.builtin.debug:
+        msg: "build_complete: {{ build_complete.resources[0].metadata.name }} {{ build_complete.resources[0].status.phase }}"
     - name: "Set the retry count back to 0 when successful"
       set_fact:
         retry_count: 0
@@ -34,4 +69,4 @@
         seconds: 10
     - debug:
         msg: "Failed to connect - Retrying..."
-    - include_tasks: ./deploy-sha.yaml
+    - include_tasks: ./deploy-sha.yaml

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

@@ -15,6 +15,7 @@
   vars:
     branch: "{{ prod_branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ prod_branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -33,6 +34,7 @@
   vars:
     branch: "{{ standby_branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ standby_branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 

tests/tests/api/deploy-branch.yaml

@@ -14,6 +14,7 @@
   vars:
     branch: "{{ branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -45,6 +46,7 @@
     branch: "{{ branch }}"
     project: "{{ project }}"
     sha: "{{ second_commit_hash }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-sha.yaml
 
@@ -62,6 +64,7 @@
   vars:
     branch: "{{ branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -79,6 +82,7 @@
     branch: "{{ branch }}"
     project: "{{ project }}"
     sha: "{{ second_commit_hash }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-sha.yaml
 

tests/tests/api/deploy-pullrequest.yaml

@@ -41,6 +41,7 @@
     git_pr_commit_hash: "{{ pr_commit_hash }}"
     git_pr_number: 1
     git_pr_title: "PR Title"
+    namespace: "{{ project | regex_replace('_', '-') }}-pr-1"
   tasks:
   - include: ../../tasks/api/deploy-pullrequest.yaml
 
@@ -80,6 +81,7 @@
     git_pr_commit_hash: "{{ pr_2nd_commit_hash }}"
     git_pr_number: 1
     git_pr_title: "PR Title - UPDATE"
+    namespace: "{{ project | regex_replace('_', '-') }}-pr-1"
   tasks:
   - include: ../../tasks/api/deploy-pullrequest.yaml
 

tests/tests/api/promote.yaml

@@ -14,6 +14,7 @@
   vars:
     branch: "{{ source_environment }}"
     project: "{{ project }}"
+    namespace:  "{{ project }}-{{ source_environment }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 

tests/tests/api/push.yaml

@@ -14,6 +14,7 @@
   vars:
     branch: "{{ branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 

tests/tests/dbaas.yaml

@@ -0,0 +1,65 @@
+---
+- include: features/random-wait.yaml
+
+- include: features/api-token.yaml
+  vars:
+    testname: "API TOKEN"
+
+- include: api/add-project.yaml
+  vars:
+    project: ci-drupal-80-{{ cluster_type }}
+    git_repo_name: drupal-80.git
+    git_url: "{{ localgit_url }}/{{ git_repo_name }}"
+
+- include: drupal/drupal.yaml
+  vars:
+    testname: "Drupal 9 composer PHP 8.0 - MARIADB DBAAS {{ cluster_type|upper }}"
+    drupal_version: 9
+    db: mariadb
+    php_version: 8.0
+    git_repo_name: drupal-80.git
+    project: ci-drupal-80-{{ cluster_type }}
+    branch: drupal9-php80-mariadb-dbaas
+
+- include: api/delete-project.yaml
+  vars:
+    project: ci-drupal-80-{{ cluster_type }}
+
+- include: api/add-project.yaml
+  vars:
+    project: ci-drupal-pg-{{ cluster_type }}
+    git_repo_name: drupal-postgres.git
+    git_url: "{{ localgit_url }}/{{ git_repo_name }}"
+
+- include: drupal/drupal.yaml
+  vars:
+    testname: "Drupal 9 composer PHP 8.0 - POSTGRES DBAAS {{ cluster_type|upper }}"
+    drupal_version: 9
+    db: postgres
+    php_version: 8.0
+    git_repo_name: drupal-postgres.git
+    project: ci-drupal-pg-{{ cluster_type }}
+    branch: drupal9-php80-postgres-dbaas
+
+- include: api/delete-project.yaml
+  vars:
+    project: ci-drupal-pg-{{ cluster_type }}
+
+- include: api/add-project.yaml
+  vars:
+    project: ci-node-mongodb-{{ cluster_type }}
+    git_repo_name: node-mongodb.git
+    git_url: "{{ localgit_url }}/{{ git_repo_name }}"
+
+- include: node-mongodb/node-mongodb.yaml
+  vars:
+    testname: "Node 16 - MONGODB DBAAS {{ cluster_type|upper }}"
+    node_version: 16
+    db: mongodb
+    git_repo_name: node-mongodb.git
+    project: ci-node-mongodb-{{ cluster_type }}
+    branch: node-mongodb-dbaas
+
+- include: api/delete-project.yaml
+  vars:
+    project: ci-node-mongodb-{{ cluster_type }}

tests/tests/deploytarget/deploytarget.yaml

@@ -14,6 +14,7 @@
   vars:
     branch: "{{ branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -37,6 +38,7 @@
   vars:
     branch: "{{ branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 

tests/tests/drupal/drupal.yaml

@@ -15,6 +15,7 @@
   vars:
     branch: "{{ branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -38,6 +39,7 @@
   vars:
     branch: "{{ branch }}"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-{{ branch | regex_replace('/', '-') }}"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 

tests/tests/drupal/drush-la.yaml

@@ -17,6 +17,7 @@
   vars:
     branch: "drush-first"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-drush-first"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -39,6 +40,7 @@
   vars:
     branch: "drush-second"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-drush-second"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -219,6 +221,7 @@
   vars:
     branch: "foo/bar"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-foo-bar"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 

tests/tests/drupal/drush-sa.yaml

@@ -17,6 +17,7 @@
   vars:
     branch: "drush-first"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-drush-first"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -39,6 +40,7 @@
   vars:
     branch: "drush-second"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-drush-second"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 
@@ -211,6 +213,7 @@
   vars:
     branch: "foo/bar"
     project: "{{ project }}"
+    namespace: "{{ project | regex_replace('_', '-') }}-foo-bar"
   tasks:
   - include: ../../tasks/api/deploy-no-sha.yaml
 

tests/tests/drush.yaml

@@ -17,6 +17,7 @@
     drupal_version: 9
     db: mariadb
     php_version: 8.0
+    overwrite_docker_compose: docker-compose.single.yml
     git_repo_name: drush.git
     project: ci-drush-la-{{ cluster_type }}