Merge pull request #2936 from uselagoon/refactor_drupal_tests

uselagoon · Nov 24, 2021 · 56557f8 · 56557f8
2 parents 3a09f6b + a38bd70
commit 56557f8
Show file tree

Hide file tree

Showing 222 changed files with 15,621 additions and 34,145 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -89,7 +89,7 @@ pipeline {
       parallel {
         stage ('1: run first test suite') {
           steps {
-            sh script: "make -j$NPROC kind/retest TESTS=[api,deploytarget,active-standby-kubernetes,features-kubernetes,features-kubernetes-2,features-api-variables] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Running first test suite on kind cluster"
+            sh script: "make -j$NPROC kind/retest TESTS=[api,deploytarget,active-standby-kubernetes,features-kubernetes,features-kubernetes-2,features-api-variables,tasks] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Running first test suite on kind cluster"
             sh script: "pkill -f './local-dev/stern'", label: "Closing off test-suite-1 log after test completion"
           }
         }
@@ -108,7 +108,7 @@ pipeline {
         stage ('2: run second test suite') {
           steps {
             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                sh script: "make -j$NPROC kind/retest TESTS=[tasks,drupal-php74,drupal-postgres,gitlab,github,bitbucket,python,node-mongodb,elasticsearch] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Running second test suite on kind cluster"
+                sh script: "make -j$NPROC kind/retest TESTS=[drupal-php80,drupal-postgres,drush,gitlab,github,bitbucket,python,node-mongodb,elasticsearch] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Running second test suite on kind cluster"
             }
             sh script: "pkill -f './local-dev/stern'", label: "Closing off test-suite-2 log after test completion"
           }

diff --git a/Makefile b/Makefile
@@ -961,7 +961,7 @@ GOJQ_VERSION = v0.12.5
 STERN_VERSION = 2.1.17
 CHART_TESTING_VERSION = v3.4.0
 KIND_IMAGE = kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
-TESTS = [api,features-kubernetes,features-kubernetes-2,features-api-variables,active-standby-kubernetes,nginx,drupal-php73,drupal-php74,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch,tasks]
+TESTS = [nginx,api,features-kubernetes,features-kubernetes-2,features-api-variables,active-standby-kubernetes,tasks,drush,drupal-php80,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch]
 CHARTS_TREEISH = main
 
 local-dev/kind:

diff --git a/local-dev/git/Dockerfile b/local-dev/git/Dockerfile
@@ -32,9 +32,11 @@ RUN mkdir -m 700 /git/.ssh && \
 	git --bare init /git/multiproject.git && \
 	git --bare init /git/node.git && \
 	git --bare init /git/drupal.git && \
-	git --bare init /git/drupal-73.git && \
 	git --bare init /git/drupal-74.git && \
+	git --bare init /git/drupal-80.git && \
 	git --bare init /git/drupal-postgres.git && \
+	git --bare init /git/drush.git && \
+	git --bare init /git/drush-sa.git && \
 	git --bare init /git/nginx.git && \
 	git --bare init /git/features.git && \
 	git --bare init /git/features-subfolder.git && \

diff --git a/...al8-dockerfiles/php7.4/builder.dockerfile → ...pal-dockerfiles/php7.4/builder.dockerfile b/...al8-dockerfiles/php7.4/builder.dockerfile → ...pal-dockerfiles/php7.4/builder.dockerfile
diff --git a/...al8-dockerfiles/php7.2/mariadb.dockerfile → ...pal-dockerfiles/php7.4/mariadb.dockerfile b/...al8-dockerfiles/php7.2/mariadb.dockerfile → ...pal-dockerfiles/php7.4/mariadb.dockerfile
diff --git a/...upal8-dockerfiles/php7.2/nginx.dockerfile → ...rupal-dockerfiles/php7.4/nginx.dockerfile b/...upal8-dockerfiles/php7.2/nginx.dockerfile → ...rupal-dockerfiles/php7.4/nginx.dockerfile
diff --git a/...drupal8-dockerfiles/php7.4/php.dockerfile → .../drupal-dockerfiles/php7.4/php.dockerfile b/...drupal8-dockerfiles/php7.4/php.dockerfile → .../drupal-dockerfiles/php7.4/php.dockerfile
diff --git a/...l8-dockerfiles/php7.2/postgres.dockerfile → ...al-dockerfiles/php7.4/postgres.dockerfile b/...l8-dockerfiles/php7.2/postgres.dockerfile → ...al-dockerfiles/php7.4/postgres.dockerfile
diff --git a/...upal8-dockerfiles/php7.2/redis.dockerfile → ...rupal-dockerfiles/php7.4/redis.dockerfile b/...upal8-dockerfiles/php7.2/redis.dockerfile → ...rupal-dockerfiles/php7.4/redis.dockerfile
diff --git a/...rupal8-dockerfiles/php7.4/solr.dockerfile → ...drupal-dockerfiles/php7.4/solr.dockerfile b/...rupal8-dockerfiles/php7.4/solr.dockerfile → ...drupal-dockerfiles/php7.4/solr.dockerfile
diff --git a/...al8-dockerfiles/php7.2/varnish.dockerfile → ...pal-dockerfiles/php7.4/varnish.dockerfile b/...al8-dockerfiles/php7.2/varnish.dockerfile → ...pal-dockerfiles/php7.4/varnish.dockerfile
diff --git a/tests/files/drupal-dockerfiles/php8.0/builder.dockerfile b/tests/files/drupal-dockerfiles/php8.0/builder.dockerfile
@@ -0,0 +1,12 @@
+ARG UPSTREAM_REPO
+ARG UPSTREAM_TAG
+FROM ${UPSTREAM_REPO:-testlagoon}/php-8.0-cli-drupal:${UPSTREAM_TAG:-latest}
+
+COPY composer.* /app/
+COPY assets /app/assets
+RUN composer install --prefer-dist --no-dev --ignore-platform-reqs --no-suggest --optimize-autoloader --apcu-autoloader
+COPY . /app
+RUN mkdir -p -v -m775 /app/web/sites/default/files
+
+# Define where the Drupal Root is located
+ENV WEBROOT=web
diff --git a/...al8-dockerfiles/php7.3/mariadb.dockerfile → ...pal-dockerfiles/php8.0/mariadb.dockerfile b/...al8-dockerfiles/php7.3/mariadb.dockerfile → ...pal-dockerfiles/php8.0/mariadb.dockerfile
diff --git a/...upal8-dockerfiles/php7.3/nginx.dockerfile → ...rupal-dockerfiles/php8.0/nginx.dockerfile b/...upal8-dockerfiles/php7.3/nginx.dockerfile → ...rupal-dockerfiles/php8.0/nginx.dockerfile
diff --git a/...drupal9-dockerfiles/php7.4/php.dockerfile → .../drupal-dockerfiles/php8.0/php.dockerfile b/...drupal9-dockerfiles/php7.4/php.dockerfile → .../drupal-dockerfiles/php8.0/php.dockerfile
@@ -3,6 +3,6 @@ ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
 FROM ${CLI_IMAGE:-builder} as builder
 
-FROM ${UPSTREAM_REPO:-testlagoon}/php-7.4-fpm:${UPSTREAM_TAG:-latest}
+FROM ${UPSTREAM_REPO:-testlagoon}/php-8.0-fpm:${UPSTREAM_TAG:-latest}
 
 COPY --from=builder /app /app
diff --git a/...l8-dockerfiles/php7.3/postgres.dockerfile → ...al-dockerfiles/php8.0/postgres.dockerfile b/...l8-dockerfiles/php7.3/postgres.dockerfile → ...al-dockerfiles/php8.0/postgres.dockerfile
diff --git a/...upal8-dockerfiles/php7.3/redis.dockerfile → ...rupal-dockerfiles/php8.0/redis.dockerfile b/...upal8-dockerfiles/php7.3/redis.dockerfile → ...rupal-dockerfiles/php8.0/redis.dockerfile
diff --git a/tests/files/drupal-dockerfiles/php8.0/solr.dockerfile b/tests/files/drupal-dockerfiles/php8.0/solr.dockerfile
@@ -0,0 +1,4 @@
+ARG UPSTREAM_REPO
+ARG UPSTREAM_TAG
+
+FROM ${UPSTREAM_REPO:-testlagoon}/solr-7-drupal:${UPSTREAM_TAG:-latest}
diff --git a/tests/files/drupal-dockerfiles/php8.0/varnish.dockerfile b/tests/files/drupal-dockerfiles/php8.0/varnish.dockerfile
@@ -0,0 +1,3 @@
+ARG UPSTREAM_REPO
+ARG UPSTREAM_TAG
+FROM ${UPSTREAM_REPO:-testlagoon}/varnish-5-drupal:${UPSTREAM_TAG:-latest}
diff --git a/tests/files/drupal8-dockerfiles/php7.2/builder.dockerfile b/tests/files/drupal8-dockerfiles/php7.2/builder.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.2/php.dockerfile b/tests/files/drupal8-dockerfiles/php7.2/php.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.2/solr.dockerfile b/tests/files/drupal8-dockerfiles/php7.2/solr.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.3/builder.dockerfile b/tests/files/drupal8-dockerfiles/php7.3/builder.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.3/php.dockerfile b/tests/files/drupal8-dockerfiles/php7.3/php.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.3/solr.dockerfile b/tests/files/drupal8-dockerfiles/php7.3/solr.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.3/varnish.dockerfile b/tests/files/drupal8-dockerfiles/php7.3/varnish.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.4/mariadb.dockerfile b/tests/files/drupal8-dockerfiles/php7.4/mariadb.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.4/nginx.dockerfile b/tests/files/drupal8-dockerfiles/php7.4/nginx.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.4/postgres.dockerfile b/tests/files/drupal8-dockerfiles/php7.4/postgres.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.4/redis.dockerfile b/tests/files/drupal8-dockerfiles/php7.4/redis.dockerfile
diff --git a/tests/files/drupal8-dockerfiles/php7.4/varnish.dockerfile b/tests/files/drupal8-dockerfiles/php7.4/varnish.dockerfile
diff --git a/tests/files/drupal8-mariadb-single/.lagoon.yml b/tests/files/drupal8-mariadb-single/.lagoon.yml
@@ -44,9 +44,9 @@ environments:
           command: drush cron
           service: cli
 
-  drupal8-composer-70-mariadb:
+  drupal8-php74-mariadb-single:
     cronjobs:
         - name: drush cron
           schedule: "1 * * * *"
           command: drush cron
-          service: cli
+          service: cli
diff --git a/tests/files/drupal8-mariadb-single/composer.json b/tests/files/drupal8-mariadb-single/composer.json
@@ -22,9 +22,7 @@
         "drupal/core": "~8.0",
         "drush/drush": "8.4.8",
         "drupal/console": "~1.0",
-        "drupal/redis": "^1.0",
-        "drupal/search_api": "^1.5",
-        "drupal/search_api_solr": "^1.2"
+        "drupal/redis": "^1.0"
     },
     "require-dev": {
         "behat/mink": "~1.7",