Merge pull request #2315 from zebrunner/develop

1.26 rc

.env → .env.original

@@ -1,11 +1,12 @@
-TAG_REPORTING_UI=1.24.0
-TAG_REPORTING_SERVICE=1.24.0
+TAG_REPORTING_UI=1.26.0
+TAG_REPORTING_SERVICE=1.26.0
 TAG_ARTIFACTS_PROXY_SERVICE=1.8.0
 TAG_MAIL_SERVICE=1.5
 TAG_IAM_SERVICE=1.15.0
 TAG_POSTGRES=9.6
-TAG_RABBITMQ=management
+TAG_RABBITMQ=3.8-management
 TAG_REDIS=5.0.5
 TAG_ELASTICSEARCH=7.9.0
 TAG_LOGSTASH=7.9.0
 TAG_NGINX=1.17
+REPORTING_PORT=8081

.gitignore

@@ -1,3 +1,5 @@
+.env
+backup/settings.env
 ### Zebrunner runtime mounts ###
 /runtime/
 

README.md

@@ -72,12 +72,12 @@ Zebrunner Reporting **client side** repositories:
 
 ## Hardware requirements
 
-|                         | Requirements                                                    	                |
-|:-----------------------:| ----------------------------------------------------------------------------------|
-| <b>Operating System</b> | Linux Ubuntu 16.04, 18.04, 20.04<br> Linux CentOS 7+<br> Amazon Linux 2           |
-| <b>       CPU      </b> | 4+ Cores                                                         	                |
-| <b>      Memory    </b> | 16Gb RAM                                                            	            |
-| <b>    Free space  </b> | SSD 64Gb+ of free space                                         	                |
+|                         | Requirements                                                            |
+|:-----------------------:| ------------------------------------------------------------------------|
+| <b>Operating System</b> | Linux Ubuntu 16.04, 18.04, 20.04<br> Linux CentOS 7+<br> Amazon Linux 2 |
+| <b>       CPU      </b> | 4+ Cores                                                                |
+| <b>      Memory    </b> | 16Gb RAM                                                                |
+| <b>    Free space  </b> | SSD 64Gb+ of free space                                                 |
 
 ## Installation steps
 
@@ -98,7 +98,7 @@ Zebrunner Reporting **client side** repositories:
 ## Community and support
 * [Telegram channel](https://t.me/zebrunner)
 * [User guide](https://zebrunner.com/documentation)
-* [On-premise deployment with Zebrunner CE](https://zebrunner.github.io/zebrunner/)
+* [On-premise deployment with Zebrunner CE](https://zebrunner.github.io/community-edition/)
 * [Zebrunner PRO](https://zebrunner.com)
 
 ## License

backup/settings.env.original

@@ -0,0 +1,23 @@
+declare -x ZBR_PROTOCOL="http"
+declare -x ZBR_REPORTING_PORT="80"
+declare -x ZBR_IAM_POSTGRES_PASSWORD=""
+declare -x ZBR_POSTGRES_PASSWORD=""
+declare -x ZBR_RABBITMQ_USER="admin"
+declare -x ZBR_RABBITMQ_PASSWORD=""
+declare -x ZBR_REDIS_PASSWORD=""
+declare -x ZBR_SMTP_ENABLED="0"
+declare -x ZBR_SMTP_HOST="smtp.gmail.com"
+declare -x ZBR_SMTP_PORT="587"
+declare -x ZBR_SMTP_EMAIL=""
+declare -x ZBR_SMTP_USER=""
+declare -x ZBR_SMTP_PASSWORD=""
+declare -x ZBR_AWS_S3_ENABLED="0"
+declare -x ZBR_MINIO_ENABLED="1"
+declare -x ZBR_STORAGE_ENDPOINT_PROTOCOL="http"
+declare -x ZBR_STORAGE_ENDPOINT_HOST="minio:9000"
+declare -x ZBR_STORAGE_REGION="us-west-1"
+declare -x ZBR_STORAGE_BUCKET="changeit"
+declare -x ZBR_STORAGE_ACCESS_KEY="changeit"
+declare -x ZBR_STORAGE_SECRET_KEY="changeit"
+declare -x ZBR_STORAGE_TENANT=""
+

configuration/reporting-service/variables.env.original

@@ -1,5 +1,4 @@
 MULTITENANT=false
-DEBUG_ENABLED=true
 WEB_HOST=http://localhost:8081
 API_HOST=http://localhost:8081
 API_CONTEXT_PATH=reporting-service
@@ -19,21 +18,6 @@ JENKINS_PASSWORD=changeit
 JENKINS_FOLDER=
 JENKINS_JOB_URL_VISIBILITY=true
 
-MCLOUD_ENABLED=false
-MCLOUD_URL=
-MCLOUD_USER=
-MCLOUD_PASSWORD=
-
-SELENIUM_ENABLED=false
-SELENIUM_URL=
-SELENIUM_USER=
-SELENIUM_PASSWORD=
-
-SCM_DEFAULT_ACCOUNT_ACCESS_TOKEN=
-SCM_DEFAULT_ACCOUNT_ORGANIZATION_NAME=qaprosoft
-SCM_DEFAULT_ACCOUNT_REPOSITORY_NAME=carina-demo
-SCM_DEFAULT_ACCOUNT_REPOSITORY_URL=https://github.com/qaprosoft/carina-demo
-
 DATABASE_URL=jdbc:postgresql://postgres:5432/postgres
 DATABASE_USERNAME=postgres
 DATABASE_PASSWORD=db-changeit