From 897804cef29e4d7d851985eab921ffad8106b0cf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 26 Apr 2017 16:07:35 +0300 Subject: [PATCH] add back stuff for selenium tests --- .gitlab-ci.yml | 14 ++ utils/gitlab-ci/config-template.php | 207 ++++++++++++++++++++++++++++ utils/gitlab-ci/nginx-default | 81 +++++++++++ 3 files changed, 302 insertions(+) create mode 100644 utils/gitlab-ci/config-template.php create mode 100644 utils/gitlab-ci/nginx-default diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5150e70b..ce6be002 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,3 +12,17 @@ schema: - /etc/init.d/postgresql start - /usr/local/sbin/init-database.sh - sh ./utils/gitlab-ci/check-schema.sh + +selenium: + image: fox/selenium-ci + when: manual + script: + - /etc/init.d/postgresql start + - /etc/init.d/nginx start + - /etc/init.d/php5-fpm start + - /usr/local/sbin/init-database.sh + - sh ./utils/gitlab-ci/check-schema.sh + - ln -s `pwd` ../../tt-rss + - cp utils/gitlab-ci/config-template.php config.php + - chmod -R 777 cache lock feed-icons + - /usr/local/sbin/init-selenium.sh diff --git a/utils/gitlab-ci/config-template.php b/utils/gitlab-ci/config-template.php new file mode 100644 index 00000000..abe34442 --- /dev/null +++ b/utils/gitlab-ci/config-template.php @@ -0,0 +1,207 @@ + System), syslog - logs to system log. + // Setting this to blank uses PHP logging (usually to http server + // error.log). + + define('CONFIG_VERSION', 26); + // Expected config version. Please update this option in config.php + // if necessary (after migrating all new options from this file). + + // vim:ft=php diff --git a/utils/gitlab-ci/nginx-default b/utils/gitlab-ci/nginx-default new file mode 100644 index 00000000..1989af92 --- /dev/null +++ b/utils/gitlab-ci/nginx-default @@ -0,0 +1,81 @@ +## +# You should look at the following URL's in order to grasp a solid understanding +# of Nginx configuration files in order to fully unleash the power of Nginx. +# http://wiki.nginx.org/Pitfalls +# http://wiki.nginx.org/QuickStart +# http://wiki.nginx.org/Configuration +# +# Generally, you will want to move this file somewhere, and start with a clean +# file but keep this around for reference. Or just disable in sites-enabled. +# +# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. +## + +# Default server configuration +# +server { + listen 80 default_server; + listen [::]:80 default_server; + + # SSL configuration + # + # listen 443 ssl default_server; + # listen [::]:443 ssl default_server; + # + # Self signed certs generated by the ssl-cert package + # Don't use them in a production server! + # + # include snippets/snakeoil.conf; + + root /builds/; + + # Add index.php to the list if you are using PHP + index index.php index.html index.htm index.nginx-debian.html; + + server_name _; + + location / { + # First attempt to serve request as file, then + # as directory, then fall back to displaying a 404. + try_files $uri $uri/ =404; + autoindex on; + } + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + location ~ \.php$ { + include snippets/fastcgi-php.conf; + + # With php5-cgi alone: + #fastcgi_pass 127.0.0.1:9000; + # With php5-fpm: + fastcgi_pass unix:/var/run/php5-fpm.sock; + } + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} + + +# Virtual Host configuration for example.com +# +# You can move that to a different file under sites-available/ and symlink that +# to sites-enabled/ to enable it. +# +#server { +# listen 80; +# listen [::]:80; +# +# server_name example.com; +# +# root /var/www/example.com; +# index index.html; +# +# location / { +# try_files $uri $uri/ =404; +# } +#} -- 2.39.2