Merge branch '7.7' into 7.x

Author: ezimuel

.ci/jobs/defaults.yml

@@ -14,7 +14,7 @@
       numToKeep: 100
     properties:
     - github:
-        url: https://github.com/elastic/elasticsearch-js/
+        url: https://github.com/elastic/elasticsearch-php/
     - inject:
         properties-content: HOME=$JENKINS_HOME
     concurrent: true
@@ -23,10 +23,10 @@
     - git:
         name: origin
         credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
-        reference-repo: /var/lib/jenkins/.git-references/elasticsearch-js.git
+        reference-repo: /var/lib/jenkins/.git-references/elasticsearch-php.git
         branches:
         - ${branch_specifier}
-        url: https://github.com/elastic/elasticsearch-js.git
+        url: https://github.com/elastic/elasticsearch-php.git
         wipe-workspace: 'True'
     triggers:
     - github
@@ -46,7 +46,7 @@
     - axis:
         type: yaml
         filename: .ci/test-matrix.yml
-        name: NODE_JS_VERSION
+        name: PHP_VERSION
     - axis:
         type: yaml
         filename: .ci/test-matrix.yml

.ci/jobs/elastic+elasticsearch-js+5.x.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+elasticsearch-js+7.x
-    display-name: 'elastic / elasticsearch-js # 7.x'
-    description: Testing the elasticsearch-js 7.x branch.
+    name: elastic+elasticsearch-php+7.x
+    display-name: 'elastic / elasticsearch-php # 7.x'
+    description: Testing the elasticsearch-php 7.x branch.
     parameters:
     - string:
         name: branch_specifier

.ci/jobs/elastic+elasticsearch-js+6.x.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+elasticsearch-js+master
-    display-name: 'elastic / elasticsearch-js # master'
-    description: Testing the elasticsearch-js master branch.
+    name: elastic+elasticsearch-php+master
+    display-name: 'elastic / elasticsearch-php # master'
+    description: Testing the elasticsearch-php master branch.
     parameters:
     - string:
         name: branch_specifier

.ci/jobs/elastic+elasticsearch-js+7.x.yml renamed to .ci/jobs/elastic+elasticsearch-php+7.x.yml

@@ -1,8 +1,8 @@
 ---
 - job:
-    name: elastic+elasticsearch-js+pull-request
-    display-name: 'elastic / elasticsearch-js # pull-request'
-    description: Testing of elasticsearch-js pull requests.
+    name: elastic+elasticsearch-php+pull-request
+    display-name: 'elastic / elasticsearch-php # pull-request'
+    description: Testing of elasticsearch-php pull requests.
     scm:
     - git:
         branches:

.ci/jobs/elastic+elasticsearch-js+master.yml renamed to .ci/jobs/elastic+elasticsearch-php+master.yml

@@ -4,7 +4,7 @@
 # STACK_VERSION -- version e.g Major.Minor.Patch(-Prelease)
 # TEST_SUITE -- which test suite to run: oss or xpack
 # ELASTICSEARCH_URL -- The url at which elasticsearch is reachable, a default is composed based on STACK_VERSION and TEST_SUITE
-# PHP_VERSION -- node js version (defined in test-matrix.yml, a default is hardcoded here)
+# PHP_VERSION -- PHP version (defined in test-matrix.yml, a default is hardcoded here)
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
 set -euo pipefail

.ci/jobs/elastic+elasticsearch-js+pull-request.yml renamed to .ci/jobs/elastic+elasticsearch-php+pull-request.yml

@@ -1,6 +1,6 @@
 ---
 STACK_VERSION:
-  - 7.x-SNAPSHOT
+  - 7.7.0-SNAPSHOT
 
 PHP_VERSION:
   - 7.4-cli

.ci/run-repository.sh

@@ -23,7 +23,6 @@ generator/*
 # Elasticsearch related
 util/elasticsearch/
 util/cache/
-util/output
 
 # Sami docs generator
 /sami.phar

.ci/test-matrix.yml

@@ -29,7 +29,7 @@ jobs:
 
 env:
   global:
-    - STACK_VERSION="7.x-SNAPSHOT"
+    - STACK_VERSION="7.7.0-SNAPSHOT"
 
 before_install:
   - ./travis/run_es_docker.sh