[TASK] Remove acceptance test setup from travis 11/50211/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Thu, 13 Oct 2016 11:42:37 +0000 (13:42 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 13 Oct 2016 12:11:17 +0000 (14:11 +0200)
The acceptance tests are very hard to stabilize on travis
and still flaky. They are disabled for quite a while for
that reason already.
The setup is now removed from travis to not clutter the
core and the config with not needed stuff.
In the unlikely case someone works on that again, they
could still be added again.

Change-Id: I95575b84e126216ec0483d2b060cafcc023e0317
Resolves: #78280
Releases: master
Reviewed-on: https://review.typo3.org/50211
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: TYPO3com <no-reply@typo3.com>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
.travis.yml
typo3/sysext/core/Build/Configuration/TravisNginxFpm/ConfigureStartNginxFpm.sh [deleted file]
typo3/sysext/core/Build/Configuration/TravisNginxFpm/nginx.tpl.conf [deleted file]
typo3/sysext/core/Build/Configuration/TravisNginxFpm/php-fpm.conf [deleted file]

index 632eba3..35fc4d9 100644 (file)
@@ -8,7 +8,7 @@ matrix:
 
   include:
     - php: 7
 
   include:
     - php: 7
-      env: UNIT_TESTS=yes FUNCTIONAL_TESTS=yes ACCEPTANCE_TESTS=no JSUNIT_TESTS=yes PHP_LINT=yes XLF_CHECK=yes SUBMODULE_TEST=yes
+      env: UNIT_TESTS=yes FUNCTIONAL_TESTS=yes JSUNIT_TESTS=yes PHP_LINT=yes XLF_CHECK=yes SUBMODULE_TEST=yes
 
 sudo: false
 
 
 sudo: false
 
@@ -52,7 +52,6 @@ before_script:
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - composer install
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - composer install
-  - typo3/sysext/core/Build/Configuration/TravisNginxFpm/ConfigureStartNginxFpm.sh
   - mkdir -p typo3temp/var/tests
   - export typo3DatabaseName="typo3"
   - export typo3DatabaseHost="localhost"
   - mkdir -p typo3temp/var/tests
   - export typo3DatabaseName="typo3"
   - export typo3DatabaseHost="localhost"
@@ -76,11 +75,6 @@ script:
     fi
 
   - >
     fi
 
   - >
-    if [[ "$ACCEPTANCE_TESTS" == "yes" ]]; then
-      ./bin/codecept run Acceptance -c typo3/sysext/core/Build/AcceptanceTests.yml --debug
-    fi
-
-  - >
     if [[ "$JSUNIT_TESTS" == "yes" ]]; then
       cd Build && npm update -g npm && npm install && cd ..
       ./Build/node_modules/karma/bin/karma start typo3/sysext/core/Build/Configuration/JSUnit/karma.conf.js --single-run
     if [[ "$JSUNIT_TESTS" == "yes" ]]; then
       cd Build && npm update -g npm && npm install && cd ..
       ./Build/node_modules/karma/bin/karma start typo3/sysext/core/Build/Configuration/JSUnit/karma.conf.js --single-run
diff --git a/typo3/sysext/core/Build/Configuration/TravisNginxFpm/ConfigureStartNginxFpm.sh b/typo3/sysext/core/Build/Configuration/TravisNginxFpm/ConfigureStartNginxFpm.sh
deleted file mode 100755 (executable)
index 28e990e..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-
-DIR=$(realpath $(dirname "$0"))
-PHP_VERSION=$(phpenv version-name)
-ROOT=$(realpath "$DIR/../../../../../..")
-PHP_FPM_BIN="$HOME/.phpenv/versions/$PHP_VERSION/sbin/php-fpm"
-PHP_FPM_CONF="$DIR/php-fpm.conf"
-
-# Start php-fpm
-"$PHP_FPM_BIN" --fpm-config "$PHP_FPM_CONF"
-
-# Build nginx config file and start nginx
-sed -e "s|{ROOT}|$ROOT|g" < "$DIR/nginx.tpl.conf" > "$ROOT/nginx.conf"
-nginx -c "$ROOT/nginx.conf"
\ No newline at end of file
diff --git a/typo3/sysext/core/Build/Configuration/TravisNginxFpm/nginx.tpl.conf b/typo3/sysext/core/Build/Configuration/TravisNginxFpm/nginx.tpl.conf
deleted file mode 100644 (file)
index 41c9a12..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-error_log /tmp/error.log;
-pid /tmp/nginx.pid;
-worker_processes 1;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    # Set an array of temp and cache file options that will otherwise default to restricted locations accessible only to root
-    client_body_temp_path /tmp/client_body;
-    fastcgi_temp_path /tmp/fastcgi_temp;
-    proxy_temp_path /tmp/proxy_temp;
-    scgi_temp_path /tmp/scgi_temp;
-    uwsgi_temp_path /tmp/uwsgi_temp;
-
-    # Basic Settings
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 65;
-    types_hash_max_size 2048;
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    # Logging Settings
-    access_log /tmp/access.log;
-
-    # Gzip Settings
-    gzip on;
-    gzip_disable "msie6";
-
-    server {
-        listen 8000 default_server;
-        listen [::]:8000 default_server ipv6only=on;
-
-        root {ROOT};
-
-        location / {
-            # First attempt to serve request as file, then as directory, then fall back to index.html
-            try_files $uri $uri/ /index.html;
-        }
-
-        location ~* "\.php(/|$)" {
-            include /etc/nginx/fastcgi_params;
-
-            fastcgi_split_path_info ^(.+\.php)(.*)$;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param SCRIPT_NAME $fastcgi_script_name;
-            fastcgi_param PATH_INFO $fastcgi_path_info;
-            fastcgi_param SERVER_NAME $host;
-
-            fastcgi_pass 127.0.0.1:9000;
-        }
-    }
-}
\ No newline at end of file
diff --git a/typo3/sysext/core/Build/Configuration/TravisNginxFpm/php-fpm.conf b/typo3/sysext/core/Build/Configuration/TravisNginxFpm/php-fpm.conf
deleted file mode 100644 (file)
index 73e1735..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[travis]
-listen = 9000
-listen.mode = 0666
-pm = static
-pm.max_children = 5
-request_terminate_timeout = 360s
-php_admin_value[memory_limit] = 256M
\ No newline at end of file