diff --git a/Makefile b/Makefile index 2f4519cfd..69667c952 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ include env.sh # Dashboard version # from https://github.com/emqx/emqx-dashboard5 -export EMQX_DASHBOARD_VERSION ?= v1.9.1 -export EMQX_EE_DASHBOARD_VERSION ?= e1.7.1 +export EMQX_DASHBOARD_VERSION ?= v1.10.0-beta.1 +export EMQX_EE_DASHBOARD_VERSION ?= e1.8.0-beta.1 export EMQX_RELUP ?= true export EMQX_REL_FORM ?= tgz diff --git a/scripts/ui-tests/dashboard_test.py b/scripts/ui-tests/dashboard_test.py index c349739b6..356432b8e 100644 --- a/scripts/ui-tests/dashboard_test.py +++ b/scripts/ui-tests/dashboard_test.py @@ -131,10 +131,7 @@ def test_docs_link(driver, dashboard_url): # it's v5.x in the url emqx_version = 'v' + emqx_version - if prefix == 'e': - docs_base_url = "https://docs.emqx.com/en/enterprise" - else: - docs_base_url = "https://docs.emqx.com/en/emqx" + docs_base_url = "https://docs.emqx.com/en/emqx" docs_url = f"{docs_base_url}/{emqx_version}" xpath = f"//div[@id='app']//div[@class='nav-header']//a[@href[starts-with(.,'{docs_url}')]]"