Changeset 49530

Timestamp:

11/06/2020 05:32:00 PM (5 years ago)

Author:

desrosj

Message:

Build/Test Tools: Backport the local Docker environment to the 4.9 branch.

This commit introduces the Docker-based local WordPress development environment to the 4.9 branch and converts the Travis test jobs to utilize this environment for easier and more consistent testing.

Until existing blockers with the PHP 5.2 Docker container can be solved, the PHP 5.2 test job will remain using the Travis precise image.

Merges [45745,45762,45783-45784,45800,45819,45885,46320,46999,47225,47912,48121,49335,49358,49360,49362] to the 4.9 branch.
See #48301, #47767.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• .env (added)
• .travis.yml (modified) (3 diffs)
• docker-compose.yml (added)
• npm-shrinkwrap.json (modified) (11 diffs)
• package.json (modified) (2 diffs)
• tests/phpunit/includes/object-cache.php (modified) (1 diff)
• tests/phpunit/tests/ajax/CustomizeMenus.php (modified) (2 diffs)
• tools/local-env (added)
• tools/local-env/default.template (added)
• tools/local-env/mysql-init.sql (added)
• tools/local-env/php-config.ini (added)
• tools/local-env/phpunit-config.ini (added)
• tools/local-env/scripts (added)
• tools/local-env/scripts/docker.js (added)
• tools/local-env/scripts/install.js (added)
• tools/local-env/scripts/start.js (added)

branches/4.9/.travis.yml

@@ -1 @@
-sudo: false
-dist: trusty
 language: php
+
+services:
+  - docker
+
 cache:
   apt: true
@@ -7 +9 @@
     - $HOME/.npm
     - vendor
-    - $HOME/.composer/cache
+
 env:
   global:
-    - WP_TRAVISCI=travis:phpunit
+    - LOCAL_DIR: build
+    - NPM_INSTALL: true
+    - WP_INSTALL: true
+    - PHP_FPM_UID: "`id -u`"
+    - PHP_FPM_GID: "`id -g`"
+
 matrix:
   include:
-  - php: 7.1
-    env: WP_TRAVISCI=travis:js
-  - php: 7.2
-  - php: 5.6
-    env: WP_TRAVIS_OBJECT_CACHE=true
-    services: memcached
-  - php: 5.2
-    dist: precise
+    - env: WP_TRAVISCI=travis:js LOCAL_PHP=7.1-fpm WP_INSTALL=false
+      name: "JS Tests"
+    - env: LOCAL_PHPUNIT=6-php-7.2-fpm WP_TRAVISCI=test:php
+      name: "PHPUnit Tests: PHP 7.2"
+    - env: LOCAL_PHP_MEMCACHED=true LOCAL_PHP=5.6-fpm LOCAL_PHPUNIT=4-php-5.6-fpm WP_TRAVISCI=test:php
+      name: "PHPUnit Tests: PHP 5.6 with Memcached"
+    - env: WP_TRAVISCI=travis:phpunit WP_INSTALL=false
+      php: 5.2
+      dist: precise
+      name: "PHPUnit Tests: PHP 5.2"
+  fast_finish: true
+
 before_install:
-- |
-  if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
+  - |
+    if [[ "$WP_TRAVISCI" == "test:php" ]]; then
+      travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
+    fi
+  - |
+    if [[ "$WP_TRAVISCI" != "travis:phpunit" ]]; then
+      curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+      sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+      sudo apt-get update
+      sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+    fi
+  - |
+    sudo rm /usr/local/bin/docker-compose
+    curl -L https://github.com/docker/compose/releases/download/1.24.0/docker-compose-`uname -s`-`uname -m` > docker-compose
+    chmod +x docker-compose
+    sudo mv docker-compose /usr/local/bin
+  - |
+    if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
       mysql -u root -e "CREATE DATABASE wordpress_tests;"
       cp wp-tests-config-sample.php wp-tests-config.php
@@ -29 +56 @@
       sed -i "s/yourusernamehere/root/" wp-tests-config.php
       sed -i "s/yourpasswordhere//" wp-tests-config.php
-      svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
-  fi
-- |
-  if [[ "$WP_TRAVIS_OBJECT_CACHE" == "true" ]]; then
-    cp tests/phpunit/includes/object-cache.php src/wp-content/object-cache.php
-    echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  fi
+      travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
+    fi
+
 before_script:
-- |
-  # Remove Xdebug for a huge performance increase:
-  if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
-    phpenv config-rm xdebug.ini
-  else
-    echo "xdebug.ini does not exist"
-  fi
-- |
-  # Export Composer's global bin dir to PATH, but not on PHP 5.2:
-  if [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
-    composer config --list --global
-    export PATH=`composer config --list --global | grep '\[home\]' | { read a; echo "${a#* }/vendor/bin:$PATH"; }`
-  fi
-- |
-  # Install the specified version of PHPUnit depending on the PHP version:
-  if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
-    case "$TRAVIS_PHP_VERSION" in
-      7.2|7.1|7.0|nightly)
-        echo "Using PHPUnit 6.x"
-        composer global require "phpunit/phpunit:^6"
-        ;;
-      5.6|5.5|5.4|5.3)
-        echo "Using PHPUnit 4.x"
-        composer global require "phpunit/phpunit:^4"
-        ;;
-      5.2)
-        # Do nothing, use default PHPUnit 3.6.x
-        echo "Using default PHPUnit, hopefully 3.6"
-        ;;
-      *)
-        echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION"
-        exit 1
-        ;;
-    esac
-  fi
-- npm --version
-- node --version
-- nvm install 6.9.1
-- npm install -g grunt-cli
-- npm install
-- npm prune
-- mysql --version
-- phpenv versions
-- php --version
-- php -m
-- npm --version
-- node --version
-- which phpunit
-- phpunit --version
-- curl --version
-- grunt --version
-- git --version
-- svn --version
-- locale -a
-script: grunt $WP_TRAVISCI
+  - npm --version
+  - node --version
+  - nvm install
+  - |
+    if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
+      phpenv config-rm xdebug.ini
+      mysql --version
+      phpenv versions
+      php --version
+      php -m
+    fi
+  - |
+    if [[ "$NPM_INSTALL" == "true" ]]; then
+      npm install
+    fi
+  - |
+    if [[ "$WP_TRAVISCI" == "test:php" ]]; then
+      npm run env:start
+      npm run build
+      docker-compose run --rm mysql mysql --version
+      docker-compose run --rm php php --version
+      docker-compose run --rm php php -m
+      docker-compose run --rm phpunit phpunit --version
+    fi
+  - |
+    if [[ "$LOCAL_PHP_MEMCACHED" == "true" ]]; then
+      cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php
+      # The memcached server needs to start after `npm run env:start`, which sets up the Docker network.
+      docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
+    fi
+  - |
+    if [[ "$WP_INSTALL" == "true" ]]; then
+      # Run the install process after memcached has started.
+      npm run env:install
+    fi
+  - npm --version
+  - node --version
+  - curl --version
+  - git --version
+  - svn --version
+  - php --version
+  - php -i
+  - locale -a
+
+script:
+  - |
+    if [[ "$WP_TRAVISCI" == "test:php" ]]; then
+      npm run test:php -- --verbose -c phpunit.xml.dist &&
+      npm run test:php -- --verbose -c phpunit.xml.dist --group ajax &&
+      npm run test:php -- --verbose -c tests/phpunit/multisite.xml &&
+      npm run test:php -- --verbose -c tests/phpunit/multisite.xml --group ms-files &&
+      npm run test:php -- --verbose -c phpunit.xml.dist --group external-http &&
+      npm run test:php -- --verbose -c phpunit.xml.dist --group restapi-jsclient &&
+      # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
+      LOCAL_PHP_XDEBUG=true npm run test:php -- -v --group xdebug --exclude-group __fakegroup__
+    else
+      npm run grunt $WP_TRAVISCI
+    fi
+
+after_script:
+  - |
+    if [[ "$WP_TEST_REPORTER" == "true" ]]; then
+      git clone https://github.com/WordPress/phpunit-test-runner.git test-runner
+      docker-compose run --rm -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
+    fi
+
 notifications:
   slack:

branches/4.9/npm-shrinkwrap.json

@@ -1 +1 @@
 {
   "name": "WordPress",
-  "version": "4.9.0",
+  "version": "4.9.16",
   "dependencies": {
     "abbrev": {
@@ -948 +948 @@
       "dev": true
     },
+    "core-js": {
+      "version": "2.6.11",
+      "from": "core-js@>=2.5.7 <3.0.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+      "dev": true
+    },
     "core-util-is": {
       "version": "1.0.2",
@@ -1337 +1343 @@
       "from": "domutils@>=1.5.0 <1.6.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "dev": true
+    },
+    "dotenv": {
+      "version": "8.2.0",
+      "from": "dotenv@>=8.2.0 <9.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "dev": true
+    },
+    "dotenv-expand": {
+      "version": "5.1.0",
+      "from": "dotenv-expand@>=5.1.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
       "dev": true
     },
@@ -2199 +2217 @@
       "dev": true
     },
+    "grunt-cli": {
+      "version": "0.1.13",
+      "from": "grunt-cli@0.1.13",
+      "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz",
+      "dev": true,
+      "dependencies": {
+        "resolve": {
+          "version": "0.3.1",
+          "from": "resolve@>=0.3.1 <0.4.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz",
+          "dev": true
+        }
+      }
+    },
     "grunt-contrib-clean": {
       "version": "1.0.0",
@@ -3304 +3336 @@
       "dev": true
     },
+    "isemail": {
+      "version": "3.2.0",
+      "from": "isemail@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "from": "punycode@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "dev": true
+        }
+      }
+    },
     "isexe": {
       "version": "2.0.0",
@@ -3321 +3367 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "dev": true
+    },
+    "joi": {
+      "version": "13.7.0",
+      "from": "joi@>=13.0.0 <14.0.0",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-13.7.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "hoek": {
+          "version": "5.0.4",
+          "from": "hoek@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz",
+          "dev": true
+        }
+      }
     },
     "jpegtran-bin": {
@@ -4565 +4625 @@
       "from": "pseudomap@>=1.0.2 <2.0.0",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.8.0",
+      "from": "psl@>=1.1.28 <2.0.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
       "dev": true
     },
@@ -4924 +4990 @@
       "dev": true
     },
+    "rx": {
+      "version": "4.1.0",
+      "from": "rx@>=4.1.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "dev": true
+    },
     "rx-lite": {
       "version": "3.1.2",
@@ -5582 +5654 @@
       "dev": true
     },
+    "topo": {
+      "version": "3.0.3",
+      "from": "topo@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz",
+      "dev": true,
+      "dependencies": {
+        "hoek": {
+          "version": "6.1.3",
+          "from": "hoek@>=6.0.0 <7.0.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
+          "dev": true
+        }
+      }
+    },
     "tough-cookie": {
       "version": "2.3.3",
@@ -5709 +5795 @@
       "dev": true
     },
+    "uri-js": {
+      "version": "4.4.0",
+      "from": "uri-js@>=4.2.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "from": "punycode@^2.1.0",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "dev": true
+        }
+      }
+    },
     "uri-path": {
       "version": "1.0.0",
@@ -5849 +5949 @@
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
       "dev": true
+    },
+    "wait-on": {
+      "version": "3.2.0",
+      "from": "wait-on@>=3.2.0 <3.3.0",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.2.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "from": "ajv@>=6.12.3 <7.0.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "dev": true
+        },
+        "aws4": {
+          "version": "1.11.0",
+          "from": "aws4@>=1.8.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.8",
+          "from": "combined-stream@>=1.0.6 <1.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "dev": true
+        },
+        "extend": {
+          "version": "3.0.2",
+          "from": "extend@>=3.0.2 <3.1.0",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "from": "fast-deep-equal@>=3.1.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.3.3",
+          "from": "form-data@>=2.3.2 <2.4.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "5.1.5",
+          "from": "har-validator@>=5.1.3 <5.2.0",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "from": "json-schema-traverse@>=0.4.1 <0.5.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.44.0",
+          "from": "mime-db@1.44.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.27",
+          "from": "mime-types@>=2.1.19 <2.2.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "from": "oauth-sign@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+          "dev": true
+        },
+        "punycode": {
+          "version": "2.1.1",
+          "from": "punycode@^2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.5.2",
+          "from": "qs@>=6.5.2 <6.6.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "dev": true
+        },
+        "request": {
+          "version": "2.88.2",
+          "from": "request@>=2.88.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+          "dev": true
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "from": "safe-buffer@>=5.1.2 <6.0.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "dev": true
+        },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "from": "tough-cookie@>=2.5.0 <2.6.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "from": "tunnel-agent@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "from": "uuid@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "dev": true
+        }
+      }
     },
     "walkdir": {

branches/4.9/package.json

@@ -14 +14 @@
   "devDependencies": {
     "autoprefixer": "^6.5.1",
+    "dotenv": "^8.2.0",
+    "dotenv-expand": "^5.1.0",
     "grunt": "~0.4.5",
     "grunt-banner": "^0.6.0",
     "grunt-contrib-clean": "~1.0.0",
+    "grunt-cli": "0.1.13",
     "grunt-contrib-compress": "~1.3.0",
     "grunt-contrib-concat": "~1.0.0",
@@ -35 +38 @@
     "grunt-rtlcss": "~2.0.1",
     "grunt-sass": "~1.2.1",
+    "grunt-webpack": "^3.0.2",
     "ink-docstrap": "^1.3.0",
-    "grunt-webpack": "^3.0.2",
     "matchdep": "~1.0.0",
+    "wait-on": "~3.2.0",
     "webpack": "^3.6.0",
     "webpack-dev-server": "^2.9.1"
+  },
+  "scripts": {
+    "build": "grunt build",
+    "build:dev": "grunt build --dev",
+    "dev": "grunt watch --dev",
+    "test": "grunt test",
+    "watch": "grunt watch",
+    "grunt": "grunt",
+    "env:start": "node ./tools/local-env/scripts/start.js",
+    "env:stop": "node ./tools/local-env/scripts/docker.js down",
+    "env:restart": "npm run env:stop && npm run env:start",
+    "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
+    "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
+    "env:install": "node ./tools/local-env/scripts/install.js",
+    "env:cli": "node ./tools/local-env/scripts/docker.js run cli",
+    "env:logs": "node ./tools/local-env/scripts/docker.js logs",
+    "env:pull": "node ./tools/local-env/scripts/docker.js pull",
+    "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit"
   }
 }

branches/4.9/tests/phpunit/includes/object-cache.php

@@ -830 +830 @@
             $this->servers = $memcached_servers;
         else
-            $this->servers = array( array( '127.0.0.1', 11211 ) );
+            $this->servers = array( array( 'memcached', 11211 ) );
 
         $this->addServers( $this->servers );

branches/4.9/tests/phpunit/tests/ajax/CustomizeMenus.php

@@ -55 +55 @@
         if ( 'administrator' != $role ) {
             // If we're not an admin, we should get a wp_die(-1).
-            $this->setExpectedException( 'WPAjaxDieStopException' );
+            $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
         }
 
@@ -430 +430 @@
         if ( 'administrator' != $role ) {
             // If we're not an admin, we should get a wp_die(-1).
-            $this->setExpectedException( 'WPAjaxDieStopException' );
+            $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
         }