Merge pull request #256 from Automattic/fix-ci

ci: fix scenario testing
Automattic · Jun 22, 2024 · c9e03d1 · c9e03d1
2 parents 74bbda0 + c5f92d5
commit c9e03d1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/test-features.yml b/.github/workflows/test-features.yml
@@ -68,6 +68,13 @@ jobs:
           - feature: cron
           - feature: cron-control-runner
           - feature: elasticsearch
+            filter: alpine-base-persist
+          - feature: elasticsearch
+            filter: alpine-base-nopersist
+          - feature: elasticsearch
+            filter: ubuntu-base-persist
+          - feature: elasticsearch
+            filter: ubuntu-base-nopersist
           - feature: mailpit
           - feature: memcached
           - feature: mariadb
@@ -113,9 +120,9 @@ jobs:
       - name: Run tests
         run: |
           if [ -z "${{ matrix.test.filter }}" ]; then
-            devcontainer features test -p features --skip-autogenerated --skip-duplicated -f "${{ matrix.test.name }}"
+            devcontainer features test -p features --skip-autogenerated --skip-duplicated -f "${{ matrix.test.feature }}"
           else
-            devcontainer features test -p features --skip-autogenerated --skip-duplicated -f "${{ matrix.test.name }}" --filter "${{ matrix.test.filter }}"
+            devcontainer features test -p features --skip-autogenerated --skip-duplicated -f "${{ matrix.test.feature }}" --filter "${{ matrix.test.filter }}"
           fi
 
   global:

diff --git a/features/src/phpmyadmin/devcontainer-feature.json b/features/src/phpmyadmin/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "id": "phpmyadmin",
     "name": "phpMyAdmin",
-    "version": "1.1.9",
+    "version": "1.1.10",
     "description": "Installs phpMyAdmin into the Dev Environment",
     "options": {
         "enabled": {

diff --git a/features/src/phpmyadmin/install.sh b/features/src/phpmyadmin/install.sh
@@ -73,8 +73,6 @@ if [ "${ENABLED}" = "true" ]; then
     curl -SL https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.gz | tar --strip-components=1 -zxm -f - -C /usr/share/webapps/phpmyadmin
 
     LC_ALL=C < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c24 > /etc/conf.d/phpmyadmin-password
-    chown "${_REMOTE_USER}:${_REMOTE_USER}" /etc/conf.d/phpmyadmin-password
-    chmod 0600 /etc/conf.d/phpmyadmin-password
     if [ -d /etc/nginx/conf.extra ]; then
         htpasswd -nim vipgo < /etc/conf.d/phpmyadmin-password > /etc/nginx/conf.extra/.htpasswd-pma
         chown "${NGINX_USER}:${NGINX_USER}" /etc/nginx/conf.extra/.htpasswd-pma

diff --git a/features/test/mariadb/scenarios.json b/features/test/mariadb/scenarios.json
@@ -25,6 +25,7 @@
     },
     "ubuntu-root-persist": {
         "image": "ghcr.io/automattic/vip-codespaces/ubuntu-base:latest",
+        "remoteUser": "root",
         "overrideCommand": false,
         "features": {
             "mariadb": {
@@ -59,6 +60,7 @@
     },
     "alpine-root-persist": {
         "image": "ghcr.io/automattic/vip-codespaces/alpine-base:latest",
+        "remoteUser": "root",
         "overrideCommand": false,
         "features": {
             "mariadb": {