diff --git a/.ci/fvt_tests/relup.lux b/.ci/fvt_tests/relup.lux index f3ac60521..1972d33ee 100644 --- a/.ci/fvt_tests/relup.lux +++ b/.ci/fvt_tests/relup.lux @@ -1,7 +1,6 @@ [config var=PROFILE] [config var=PACKAGE_PATH] [config var=BENCH_PATH] -[config var=ONE_MORE_EMQX_PATH] [config var=VSN] [config var=OLD_VSNS] @@ -33,14 +32,20 @@ [shell emqx2] !cd $PACKAGE_PATH - !cp -f $ONE_MORE_EMQX_PATH/one_more_$(echo $PROFILE | sed 's/-/_/g').sh . - !./one_more_$(echo $PROFILE | sed 's/-/_/g').sh emqx2 + !cp -r emqx emqx2 ?SH-PROMPT !cd emqx2 - !sed -i '/emqx_telemetry/d' data/loaded_plugins - - !./bin/emqx console + """! + EMQX_NODE__NAME='emqx2@127.0.0.1' \ + EMQX_STATSD__SERVER='127.0.0.1:8124' \ + EMQX_LISTENERS__TCP__DEFAULT__BIND='0.0.0.0:1882' \ + EMQX_LISTENERS__SSL__DEFAULT__BIND='0.0.0.0:8882' \ + EMQX_LISTENERS__WS__DEFAULT__BIND='0.0.0.0:8082' \ + EMQX_LISTENERS__WSS__DEFAULT__BIND='0.0.0.0:8085' \ + EMQX_DASHBOARD__LISTENERS__HTTP__BIND='0.0.0.0:18082' \ + ./bin/emqx console + """ ?EMQ X .* is started successfully! ?SH-PROMPT diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index 9783d0781..628684089 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -15,6 +15,8 @@ on: jobs: relup_test: + runs-on: aws-amd64 + strategy: matrix: profile: @@ -32,13 +34,13 @@ jobs: arch: - amd64 - runs-on: ubuntu-20.04 container: "ghcr.io/emqx/emqx-builder/5.0-16:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" defaults: run: shell: bash steps: + - uses: AutoModality/action-clean@v1 - uses: actions/setup-python@v2 with: python-version: '3.8' @@ -48,11 +50,6 @@ jobs: repository: emqx/paho.mqtt.testing ref: develop-4.0 path: paho.mqtt.testing - - uses: actions/checkout@v2 - with: - repository: terry-xiaoyu/one_more_emqx - ref: master - path: one_more_emqx - uses: actions/checkout@v2 with: repository: emqx/emqtt-bench @@ -103,7 +100,6 @@ jobs: --var PROFILE=$PROFILE \ --var PACKAGE_PATH=$(pwd)/packages \ --var BENCH_PATH=$(pwd)/emqtt-bench \ - --var ONE_MORE_EMQX_PATH=$(pwd)/one_more_emqx \ --var VSN="$VSN" \ --var OLD_VSNS="$OLD_VSNS" \ emqx/.ci/fvt_tests/relup.lux