PHPC-1271: Add (only) RHEL on zSeries to Evergreen Matrix

Author: derickr

.evergreen/config.yml

@@ -639,9 +639,9 @@ axes:
       - id: rhel70-test
         display_name: "RHEL 7.0"
         run_on: rhel70
-      - id: rhel72-zseries
-        display_name: "RHEL 7.2 zSeries"
-        run_on: rhel72-zseries-test
+      - id: rhel71-power8
+        display_name: "RHEL 7.1 Power 8"
+        run_on: rhel71-power8-test
   - id: os-php7
     display_name: OS
     values:
@@ -651,8 +651,11 @@ axes:
       - id: rhel70-test
         display_name: "RHEL 7.0"
         run_on: rhel70
-      - id: rhel72-zseries
-        display_name: "RHEL 7.2 zSeries"
+      - id: rhel71-power8
+        display_name: "RHEL 7.1 Power 8"
+        run_on: rhel71-power8-test
+      - id: rhel74-zseries
+        display_name: "RHEL 7.4 zSeries"
         run_on: rhel72-zseries-test
 
 buildvariants:
@@ -682,7 +685,7 @@ buildvariants:
 
 - matrix_name: "mongo-30-php7"
   matrix_spec: {"os-php7": "*", "versions": ["3.0", "3.2", "3.4"], "php-versions": "7.2" }
-  exclude_spec: {"os-php7": "rhel71-power8", "versions": "3.0", "php-versions": "7.2"}
+  exclude_spec: [ {"os-php7": "rhel71-power8", "versions": "3.0", "php-versions": "7.2"}, {"os-php7": "rhel74-zseries", "versions": ["3.0", "3.2"], "php-versions": "7.2"} ]
   display_name: "${versions}/${php-versions} — ${os-php7}"
   tasks:
      - name: "test-standalone-old"
@@ -721,6 +724,8 @@ buildvariants:
 
 - matrix_name: "mongo-40-php7"
   matrix_spec: {"os-php7": "*", "versions": ["4.0", "latest"], "php-versions": "7.2" }
+  exclude_spec:
+     - {"os-php7": "rhel74-zseries", "versions": ["4.0", "latest"], "php-versions": "7.2"}
   display_name: "${versions}/${php-versions} — ${os-php7}"
   tasks:
      - name: "test-standalone"
@@ -731,3 +736,15 @@ buildvariants:
      - name: "test-replicaset-single"
      - name: "test-sharded"
      - name: "test-sharded-rs"
+
+- matrix_name: "mongo-40-php7-nossl"
+  matrix_spec: {"os-php7": "rhel74-zseries", "versions": ["4.0", "latest"], "php-versions": "7.2"}
+  display_name: "${versions}/${php-versions} — ${os-php7}"
+  tasks:
+     - name: "test-standalone"
+     - name: "test-standalone-auth"
+     - name: "test-replicaset"
+     - name: "test-replicaset-auth"
+     - name: "test-replicaset-single"
+     - name: "test-sharded"
+     - name: "test-sharded-rs"

php_phongo.c

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 /* External libs */
 #include "bson/bson.h"
 #include "mongoc/mongoc.h"
@@ -34,6 +30,10 @@
 #include <ext/spl/spl_exceptions.h>
 #include <ext/standard/php_var.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #if PHP_VERSION_ID >= 70000
 #include <Zend/zend_smart_str.h>
 #else

src/BSON/Binary.c

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <php.h>
 #include <ext/standard/base64.h>
 #include <Zend/zend_interfaces.h>
@@ -29,6 +25,10 @@
 #include <ext/standard/php_smart_str.h>
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "phongo_compat.h"
 #include "php_phongo.h"
 

src/BSON/BinaryInterface.c

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include <php.h>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <php.h>
-
 #include "phongo_compat.h"
 #include "php_phongo.h"
 

src/BSON/DBPointer.c

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <php.h>
 #include <Zend/zend_interfaces.h>
 #include <ext/standard/php_var.h>
@@ -27,6 +23,10 @@
 #include <ext/standard/php_smart_str.h>
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "phongo_compat.h"
 #include "php_phongo.h"
 #include "php_bson.h"

src/BSON/Decimal128.c

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <php.h>
 #include <Zend/zend_interfaces.h>
 #include <ext/standard/php_var.h>
@@ -27,6 +23,10 @@
 #include <ext/standard/php_smart_str.h>
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "phongo_compat.h"
 #include "php_phongo.h"
 

src/BSON/Decimal128Interface.c

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include <php.h>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <php.h>
-
 #include "phongo_compat.h"
 #include "php_phongo.h"
 

src/BSON/Int64.c

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <php.h>
 #include <Zend/zend_interfaces.h>
 #include <ext/standard/php_var.h>
@@ -27,6 +23,10 @@
 #include <ext/standard/php_smart_str.h>
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "phongo_compat.h"
 #include "php_phongo.h"
 #include "php_bson.h"

src/BSON/Javascript.c

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <php.h>
 #include <Zend/zend_interfaces.h>
 #include <ext/standard/php_var.h>
@@ -27,6 +23,10 @@
 #include <ext/standard/php_smart_str.h>
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "phongo_compat.h"
 #include "php_phongo.h"
 #include "php_bson.h"

src/BSON/JavascriptInterface.c

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+#include <php.h>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <php.h>
-
 #include "phongo_compat.h"
 #include "php_phongo.h"