yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11463 from Kinplemelon/kinple/for-upgrade-dashboard

This commit is contained in:
Ivan Dyachkov 2023-08-17 17:55:21 +02:00 committed by GitHub
parent e3572eb758 bd2155198a
commit addb94d767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.ci/docker-compose-file/docker-compose-hstreamdb.yaml
View File

@ -5,8 +5,10 @@ services:
image: hstreamdb/hstream:v0.15.0 image: hstreamdb/hstream:v0.15.0
container_name: hstreamdb container_name: hstreamdb
depends_on: depends_on:
- zookeeper zookeeper:
- hstore condition: service_started
hstore:
condition: service_healthy
# ports: # ports:
# - "127.0.0.1:6570:6570" # - "127.0.0.1:6570:6570"
expose: expose:
@ -53,7 +55,14 @@ services:
--use-tcp --tcp-host $$(hostname -I | awk '{print $$1}') \ --use-tcp --tcp-host $$(hostname -I | awk '{print $$1}') \
--user-admin-port 6440 \ --user-admin-port 6440 \
--param enable-dscp-reflection=false \ --param enable-dscp-reflection=false \
--no-interactive --no-interactive \
> /data/store/hstore.log 2>&1
healthcheck:
test: ["CMD", "grep", "LogDevice Cluster running", "/data/store/hstore.log"]
interval: 10s
timeout: 10s
retries: 60
start_period: 60s
zookeeper: zookeeper:
image: zookeeper image: zookeeper

2
Makefile
View File

@ -16,7 +16,7 @@ endif
# Dashboard version # Dashboard version
# from https://github.com/emqx/emqx-dashboard5 # from https://github.com/emqx/emqx-dashboard5
export EMQX_DASHBOARD_VERSION ?= v1.3.2 export EMQX_DASHBOARD_VERSION ?= v1.3.2
export EMQX_EE_DASHBOARD_VERSION ?= e1.1.1 export EMQX_EE_DASHBOARD_VERSION ?= e1.2.0-beta.4
# `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used
# In make 4.4+, for backward-compatibility the value from the original environment is used. # In make 4.4+, for backward-compatibility the value from the original environment is used.

9
scripts/ui-tests/dashboard_test.py
View File

@ -62,12 +62,13 @@ def test_log(driver, login, dashboard_url):
ensure_current_url(driver, dest_url) ensure_current_url(driver, dest_url)
title = wait_title(driver) title = wait_title(driver)
assert "Logging" == title.text assert "Logging" == title.text
label = driver.find_element(By.XPATH, "//div[@id='app']//form//label[./label/span[text()='Enable Log Handler']]")
label = driver.find_element(By.XPATH, "//div[@id='app']//form//label[contains(., 'Enable Log Handler')]")
assert driver.find_elements(By.ID, label.get_attribute("for")) assert driver.find_elements(By.ID, label.get_attribute("for"))
label = driver.find_element(By.XPATH, "//div[@id='app']//form//label[./label/span[text()='Log Level']]") label = driver.find_element(By.XPATH, "//div[@id='app']//form//label[contains(., 'Log Level')]")
assert driver.find_elements(By.ID, label.get_attribute("for")) assert driver.find_elements(By.ID, label.get_attribute("for"))
label = driver.find_element(By.XPATH, "//div[@id='app']//form//label[./label/span[text()='Log Formatter']]") label = driver.find_element(By.XPATH, "//div[@id='app']//form//label[contains(., 'Log Formatter')]")
assert driver.find_elements(By.ID, label.get_attribute("for")) assert driver.find_elements(By.ID, label.get_attribute("for"))
label = driver.find_element(By.XPATH, "//div[@id='app']//form//label[./label/span[text()='Time Offset']]") label = driver.find_element(By.XPATH, "//div[@id='app']//form//label[contains(., 'Time Offset')]")
assert driver.find_elements(By.ID, label.get_attribute("for")) assert driver.find_elements(By.ID, label.get_attribute("for"))