Merge pull request #473 from zebrunner/develop

1.9 rc

.env.original

@@ -0,0 +1,2 @@
+ZBR_PORT=80
+TAG_NGINX=1.17

.gitignore

@@ -1,3 +1,4 @@
+.env
 *.bak
 nginx/conf.d/default.conf
 .disabled

README.md

@@ -19,7 +19,7 @@ Enjoy using Zebrunner Reporting in your testing process! Feel free to support th
 </p>
 
 ## Initial setup
-Visit [Zebrunner Guide](https://zebrunner.github.io/zebrunner) for detailed installation and configuration instructions.
+Visit [Zebrunner Guide](https://zebrunner.github.io/community-edition) for detailed installation and configuration instructions.
 
 1. Clone [Zebrunner](https://github.com/zebrunner/zebrunner) recursive and launch setup procedure:
   ```
@@ -30,21 +30,21 @@ Visit [Zebrunner Guide](https://zebrunner.github.io/zebrunner) for detailed inst
 2. After the startup, the following components might be available:
   > Use your host address instead of `hostname`!  
   
-| Components          	| URL                                                                                    |
-|---------------------	|--------------------------------------------------------------------------------------- |
-| Zebrunner Reporting  	| [http://hostname](http://hostname)                                                     |
-| Jenkins             	| [http://hostname/jenkins](http://hostname/jenkins)                                 	   |
-| SonarQube           	| [http://hostname/sonarqube](http://hostname/sonarqube)                             	   |
-| Web Selenium Hub    	| [http://demo:demo@hostname/selenoid/wd/hub](http://demo:demo@hostname/selenoid/wd/hub) |
-| Mobile Selenium Hub 	| [http://demo:demo@hostname/mcloud/wd/hub](http://demo:demo@hostname/mcloud/wd/hub) 	   |
-| Mobile SmartTest Farm	| [http://hostname/stf](http://hostname/stf)                                         	   |
+| Components            | URL                                                                |
+|---------------------  | ------------------------------------------------------------------ |
+| Zebrunner Reporting   | [http://hostname](http://hostname)                                 |
+| Jenkins               | [http://hostname/jenkins](http://hostname/jenkins)                 |
+| SonarQube             | [http://hostname/sonarqube](http://hostname/sonarqube)             |
+| Web Selenium Hub      | [http://hostname/selenoid/wd/hub](http://hostname/selenoid/wd/hub) |
+| Mobile Selenium Hub   | [http://hostname/mcloud/wd/hub](http://hostname/mcloud/wd/hub)     |
+| Mobile SmartTest Farm | [http://hostname/stf](http://hostname/stf)                         |
 
 > admin/changeit crendetials should be used for Reporting and Jenkins, admin/admin for SonarQube.
 
 
 ## Documentation and free support
 * [Zebrunner PRO](https://zebrunner.com)
-* [Zebrunner CE](https://zebrunner.github.io/zebrunner)
+* [Zebrunner CE](https://zebrunner.github.io/community-edition)
 * [Zebrunner Reporting](https://zebrunner.com/documentation)
 * [Carina Guide](http://zebrunner.github.io/carina)
 * [Demo Project](https://github.com/zebrunner/carina-demo)

docker-compose.yml

@@ -18,5 +18,5 @@ services:
      options:
       max-size: "512m"
     ports:
-     - "80:80"
+     - "${ZBR_PORT}:80"
     restart: always

docs/index.md

@@ -23,7 +23,7 @@ Welcome to the Zebrunner Tutorial. This manual is designed to help you install,
 > In short, the aim of this manual is to explain the tasks involved in administering Zebrunner (Community Edition)
 
 ## Audience
-This guide is written for all levels of administrators, from those responsible for deployment and setup, to those who oversee the entire system and its usage. In addition, some information from [User Guide](https://zebrunner.github.io/zebrunner/user-guide/) is intended for TestOps engineers who want to build effective Test Automation process and follow best practices.
+This guide is written for all levels of administrators, from those responsible for deployment and setup, to those who oversee the entire system and its usage. In addition, some information from [User Guide](https://zebrunner.github.io/community-edition/user-guide/) is intended for TestOps engineers who want to build effective Test Automation process and follow best practices.
 
 ## Assumed Knowledge
 Installation and Configuration guides are for administrators who install, deploy and Manage Zebrunner products. It assumes the following knowledge:

docs/install-guide.md

@@ -11,14 +11,14 @@
 2. After startup, the following components might be available:
   > Use your host domain address or IP instead of `hostname`.
   
-| Components          	| URL                                                                                                        |
-|---------------------	|----------------------------------------------------------------------------------------------------------  |
-| Zebrunner Reporting  	| [http://hostname](http://hostname)                                                 	                     |
-| Jenkins             	| [http://hostname/jenkins](http://hostname/jenkins)                                              	     |
-| SonarQube           	| [http://hostname/sonarqube](http://hostname/sonarqube)                             	                     |
-| Web Selenium Hub    	| [http://demo:demo@hostname/selenoid/wd/hub](http://demo:demo@demo.zebrunner.com/selenoid/wd/hub) |
-| Mobile Selenium Hub 	| [http://demo:demo@hostname/mcloud/wd/hub](http://demo:demo@demo.zebrunner.com/mcloud/wd/hub)     |
-| Mobile SmartTest Farm	| [http://hostname/stf](http://hostname/stf)                                         	                     |
+| Components            | URL                                                                |
+|---------------------	|------------------------------------------------------------------- |
+| Zebrunner Reporting   | [http://hostname](http://hostname)                                 |
+| Jenkins               | [http://hostname/jenkins](http://hostname/jenkins)                 |
+| SonarQube             | [http://hostname/sonarqube](http://hostname/sonarqube)             |
+| Web Selenium Hub      | [http://hostname/selenoid/wd/hub](http://hostname/selenoid/wd/hub) |
+| Mobile Selenium Hub   | [http://hostname/mcloud/wd/hub](http://hostname/mcloud/wd/hub)     |
+| Mobile SmartTest Farm	| [http://hostname/stf](http://hostname/stf)                         |
 
 > admin/changeit crendetials should be used for Reporting and Jenkins, admin/admin for SonarQube.
 

nginx/conf.d/default.conf.original

@@ -8,7 +8,6 @@ server {
     server_name localhost;
 
     # Uncomment below block to setup SSL on this NGiNX instance. make sure to put ssl.crt and ssl.key to nginx/ssl shared folder
-#    listen 443 ssl;
 #    ssl_certificate /etc/nginx/ssl/ssl.crt;
 #    ssl_certificate_key /etc/nginx/ssl/ssl.key;
 #    ssl_session_timeout 5m;
@@ -34,8 +33,8 @@ server {
 
     #workaround for static jenkins icon svg
     location ~ /jenkins/static {
-        set $upstream_jenkins jenkins-master:8080;
-        proxy_pass http://$upstream_jenkins;
+        set $upstream_jenkins http://jenkins-master:8080;
+        proxy_pass $upstream_jenkins;
     }
 
     location ~ /jenkins.*.svg {
@@ -47,8 +46,6 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $http_host;
 
-        #proxy_redirect off;
-	#proxy_redirect http:// https://;
 
         if (!-f $request_filename) {
             set $upstream_jenkins http://jenkins-master:8080;
@@ -118,18 +115,8 @@ server {
         root   /usr/share/nginx;
     }
 
-# IMPORTANT!!! make sure to generate secure Selenoid/MCloud credentials and put them into the nginx/htpasswd/selenoid.htpasswd and mcloud.htpasswd files
-#  1. install htpasswd utility and regenerate default credentials in *.htpasswd, for example
-#       htpasswd -bc nginx/htpasswd/selenoid.htpasswd username password
-#  2. Update appropriate Selenium/MCloud provider urls in Reporting and CI
-#       http://username:password/hostname/selenoid/wd/hub
-#       http://username:password/hostname/mcloud/wd/hub
-
     # Selenoid Hub
     location  ~ ^/selenoid/(.*)$ {
-      auth_basic "Private Selenoid Hub";
-      auth_basic_user_file /usr/share/nginx/htpasswd/selenoid.htpasswd;
-
       set $upstream_selenoid http://selenoid:4444;
       proxy_pass $upstream_selenoid/$1;
 
@@ -153,9 +140,6 @@ server {
     }
 
    location /mcloud {
-      auth_basic "Private MCloud Selenium Hub";
-      auth_basic_user_file /usr/share/nginx/htpasswd/mcloud.htpasswd;
-
       proxy_connect_timeout   60;
       proxy_send_timeout      300;
       proxy_read_timeout      300;

nginx/ssl/ssl.crt

@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFrzCCA5egAwIBAgIUdm5LjzUnY31xxP+cyfqkDSEFBjwwDQYJKoZIhvcNAQEL
+BQAwZzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRIwEAYDVQQHDAlSb3Nldmls
+bGUxFjAUBgNVBAoMDVplYnJ1bm5lciBJbmMxCzAJBgNVBAsMAlFBMRIwEAYDVQQD
+DAlsb2NhbGhvc3QwHhcNMjExMDA5MTE1MjI5WhcNMzExMDA3MTE1MjI5WjBnMQsw
+CQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCVJvc2V2aWxsZTEWMBQG
+A1UECgwNWmVicnVubmVyIEluYzELMAkGA1UECwwCUUExEjAQBgNVBAMMCWxvY2Fs
+aG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOYJs/SBjPNBoiuk
+m0HKMBgsmSerEmx99uMjRJn9+KXi6m198hPEQOjXQklsxP9sdQYMFQTx9JTFQ9SG
+uuNzrAq2npkndNoT5czWNib/hPc6xg50ujBldugcHfNE1enqxq8ysltkeN3cz50g
+auYKro7jdzBRUKwhB+AOHdmv/Sx5wHpSTOJHtvB40I1/5Com+ysvG3vhoNuupUE0
+sdOs8Tqdgo8fW4gYFkb/a0s7boNrE27qbP0ImPnaRMP3nNe3ug29AiB71Z/FNSpN
+Swi/vWRYQNlj0s8CFqfoyQbqD1M9e5UeL2j4927oE7y10QNJ8PpIsy28pgeutcIE
+OcoQgZyNzqOYgYVX6b+OgBKQhLJhTWGk9yuAUjpGFIBieHX+A1nKTpKdkQWDqXnj
+PktfZ1kpcNnPIvXlHgLSV+ulBsQGvRGwvrK0FGxnMQXcupC9NmxGOxxdt0TPAYRX
+U2inIJOo+t3LDJZ11pFUCbaJG9eN5TyZu54l2ZctyC+yPd2djmwFY9pK17FyKu/N
+sJbpYS4FgWPUFZ1p8OmoZIyxCumHfUtz4cB60goZnWzPlMFqGOPE8r7iBDLJjT3Y
+g5V0WleDLJdrSQmdXPVlqWQXdEoFTyHAB4+FmnOcYXRRcdmZPlpEwEhOeC0MKyTr
+XP32XEn4lUUEBAdSBFfw6aOzA/VbAgMBAAGjUzBRMB0GA1UdDgQWBBTpFxwqosnF
+2G8cmeDuNuTdA5j82DAfBgNVHSMEGDAWgBTpFxwqosnF2G8cmeDuNuTdA5j82DAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCDIy3tTjy/HIa2BBRB
+Dtn6fBWQDe4/EE03SfyVpFJk3/AzchMljBrnmhrvyRCrV8bESflCjwSgnSIsqBF/
+iISnPjUIesrnM/mW5teIBgWP3Rt+C0TJnZgipWMakA5Ka/xWPSt8W8CZJ5o8Vuly
+qGA4xT6w5RmX9Pe86GBHuzQo7n86SV6SZ4Z+vq4i+IKhbnIellTXsn0uruQ6Ij/E
+G+1bblvsN/qKs+GK0xI6vCo38BZqleCbSmBQpusHp/I8pqVPkWK4GyVIsQunzfhO
+oXP4z1gPHKRdQvcpVxBWdp6KtZ4xAJXXDwDTFgddTD8Nb8FD9leAWy9Gkx266bTP
+ikfybm7P2w+/a8Y8nUVomh21xX3+joD+puhMQ0pt0Y13/bpYHxaIefnZUozR75IP
+d5A+BWIy5Yhxqrp4rkqMKRPeLdtOUeBz1fNNA3a7F38mJEoeUh5Fe49sHxQhH/Vv
+N3uhbBnkSZzYxgHewnaItlXnMZuzRAcF1POnuHx6FOF/EzQJ+9fh9jFf1DDE2YlL
+I/7mhKe4ieLU2Z3xl7KRcrG3B85r57/qgDfGDffzKfE0ZS6U725Z/NaxQBgfxM/7
+FIG3pLwOV3OzdUDEZz4sfvitzqprzBUzVSmfD2PbPapQwz6dvWanXjoSsMBMMZTt
+BzZO47rvBFbQR0Es4v8f/dUq6Q==
+-----END CERTIFICATE-----

nginx/ssl/ssl.key

@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+i3gD47/Gq1yAhveMR3sGCBpJHZIXF/g=
+-----END PRIVATE KEY-----

patch/1.3.sh

@@ -28,7 +28,7 @@ if [[ ! -f jenkins/.disabled ]] ; then
   # regenerage variables.env to register new ZEBRUNNER_VERSION var
   cp jenkins/variables.env.original jenkins/variables.env
   replace jenkins/variables.env "http://localhost:8080/jenkins" "$ZBR_PROTOCOL://$ZBR_HOSTNAME:$ZBR_PORT/jenkins"
-  replace jenkins/variables.env "INFRA_HOST=localhost:8080" "INFRA_HOST=${ZBR_INFRA_HOST}"
+  replace jenkins/variables.env "INFRA_HOST=localhost:8080" "INFRA_HOST=$ZBR_HOSTNAME:$ZBR_PORT"
 
   if [[ ! -z $ZBR_SONAR_URL ]]; then
     replace jenkins/variables.env "SONAR_URL=" "SONAR_URL=${ZBR_SONAR_URL}"

patch/1.4.sh

@@ -43,7 +43,7 @@ if [[ ! -f jenkins/.disabled ]] ; then
   # regenerage variables.env to register new ZEBRUNNER_VERSION var
   cp jenkins/variables.env.original jenkins/variables.env
   replace jenkins/variables.env "http://localhost:8080/jenkins" "$ZBR_PROTOCOL://$ZBR_HOSTNAME:$ZBR_PORT/jenkins"
-  replace jenkins/variables.env "INFRA_HOST=localhost:8080" "INFRA_HOST=${ZBR_INFRA_HOST}"
+  replace jenkins/variables.env "INFRA_HOST=localhost:8080" "INFRA_HOST=$ZBR_HOSTNAME:$ZBR_PORT"
 
   if [[ ! -z $ZBR_SONAR_URL ]]; then
     replace jenkins/variables.env "SONAR_URL=" "SONAR_URL=${ZBR_SONAR_URL}"

patch/1.8.sh

@@ -29,7 +29,7 @@ if [[ ! -f jenkins/.disabled ]] ; then
   # regenerage variables.env to register new ZEBRUNNER_VERSION var
   cp jenkins/variables.env.original jenkins/variables.env
   replace jenkins/variables.env "http://localhost:8080/jenkins" "$ZBR_PROTOCOL://$ZBR_HOSTNAME:$ZBR_PORT/jenkins"
-  replace jenkins/variables.env "INFRA_HOST=localhost:8080" "INFRA_HOST=${ZBR_INFRA_HOST}"
+  replace jenkins/variables.env "INFRA_HOST=localhost:8080" "INFRA_HOST=$ZBR_HOSTNAME:$ZBR_PORT"
 
   if [[ ! -z $ZBR_SONAR_URL ]]; then
     replace jenkins/variables.env "SONAR_URL=" "SONAR_URL=${ZBR_SONAR_URL}"