Merge pull request #8751 from zmstone/0817-ci-fix-slim-build

ci: update OTP version
2022-08-18 07:07:49 +01:00 · 2022-08-18 07:07:49 +01:00 · 0dbc07e73f
parent 1eadd4f750 b4ea2aefa6
commit 0dbc07e73f
18 changed files with 47 additions and 38 deletions
--- a/.ci/build_packages/Dockerfile
+++ b/.ci/build_packages/Dockerfile
@ -1,4 +1,4 @@
-ARG BUILD_FROM=emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+ARG BUILD_FROM=emqx/build-env:erl23.3.4.9-3-ubuntu20.04
 FROM ${BUILD_FROM}

 ARG EMQX_NAME=emqx
--- a/.ci/build_packages/tests.sh
+++ b/.ci/build_packages/tests.sh
@ -139,6 +139,10 @@ relup_test(){

        find . -maxdepth 1 -name "${EMQX_NAME}-*-${ARCH}.zip" |
            while read -r pkg; do
+                if [[ "${pkg}" == *4.3.13* ]]; then
+                    echo "skipping upgrade test from 4.3.13 because this release had crypto linked with openssl 1.1.1n, it was in later version rolled back (to default 1.1.1k)."
+                    continue
+                fi
                packagename=$(basename "${pkg}")
                unzip -q "$packagename"
                ./emqx/bin/emqx start || ( tail emqx/log/emqx.log.1 && exit 1 )
--- a/.ci/docker-compose-file/docker-compose.yaml
+++ b/.ci/docker-compose-file/docker-compose.yaml
@ -3,7 +3,7 @@ version: '3.9'
 services:
  erlang:
    container_name: erlang
-    image: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+    image: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
    env_file:
      - conf.env
    environment:
--- a/.github/workflows/apps_version_check.yaml
+++ b/.github/workflows/apps_version_check.yaml
@ -9,7 +9,7 @@ jobs:
    strategy:
      matrix:
        erl_otp:
-        - erl23.2.7.2-emqx-3
+        - erl23.3.4.9-3
        os:
        - ubuntu20.04

--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@ -18,7 +18,7 @@ on:
 jobs:
  prepare:
    runs-on: ubuntu-20.04
-    container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+    container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04

    outputs:
      profiles: ${{ steps.set_profile.outputs.profiles}}
@ -125,7 +125,7 @@ jobs:
      matrix:
        profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
        erl_otp:
-          - 23.2.7.2-emqx-3
+          - 23.3.4.9-3
        exclude:
          - profile: emqx-edge
        macos:
--- a/.github/workflows/build_slim_packages.yaml
+++ b/.github/workflows/build_slim_packages.yaml
@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        erl_otp:
-        - erl23.2.7.2-emqx-3
+        - erl23.3.4.9-3
        os:
        - ubuntu20.04
        - centos7
@ -55,7 +55,7 @@ jobs:
    strategy:
      matrix:
        erl_otp:
-        - 23.2.7.2-emqx-3
+        - 23.3.4.9-3
        macos:
        - macos-11
    runs-on: ${{ matrix.macos }}
--- a/.github/workflows/check_deps_integrity.yaml
+++ b/.github/workflows/check_deps_integrity.yaml
@ -5,7 +5,7 @@ on: [pull_request]
 jobs:
  check_deps_integrity:
    runs-on: ubuntu-20.04
-    container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+    container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04

    steps:
      - uses: actions/checkout@v2
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -7,7 +7,7 @@ on:
 jobs:
  prepare:
    runs-on: ubuntu-20.04
-    container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+    container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04

    outputs:
      profiles: ${{ steps.set_profile.outputs.profiles}}
--- a/.github/workflows/run_acl_migration_tests.yaml
+++ b/.github/workflows/run_acl_migration_tests.yaml
@ -5,7 +5,7 @@ on: workflow_dispatch
 jobs:
    test:
        runs-on: ubuntu-20.04
-        container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+        container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
        strategy:
            fail-fast: true
        env:
--- a/.github/workflows/run_fvt_tests.yaml
+++ b/.github/workflows/run_fvt_tests.yaml
@ -15,7 +15,7 @@ jobs:
        - uses: actions/checkout@v1
        - uses: erlef/setup-beam@v1
          with:
-            otp-version: "23.2"
+            otp-version: "23.3.4.9"
        - name: make docker
          run: |
            if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -67,7 +67,7 @@ jobs:
        - uses: actions/checkout@v1
        - uses: erlef/setup-beam@v1
          with:
-            otp-version: "23.2"
+            otp-version: "23.3.4.9"
        - name: prepare
          run: |
            if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -176,7 +176,7 @@ jobs:

    relup_test_plan:
        runs-on: ubuntu-20.04
-        container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+        container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
        outputs:
          profile: ${{ steps.profile-and-versions.outputs.profile }}
          vsn: ${{ steps.profile-and-versions.outputs.vsn }}
@ -222,7 +222,7 @@ jobs:
    relup_test_build:
        needs: relup_test_plan
        runs-on: ubuntu-20.04
-        container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+        container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04
        defaults:
          run:
            shell: bash
--- a/.github/workflows/run_test_cases.yaml
+++ b/.github/workflows/run_test_cases.yaml
@ -10,7 +10,7 @@ on:
 jobs:
    run_proper_test:
        runs-on: ubuntu-20.04
-        container: emqx/build-env:erl23.2.7.2-emqx-3-ubuntu20.04
+        container: emqx/build-env:erl23.3.4.9-3-ubuntu20.04

        steps:
        - uses: actions/checkout@v2
--- a/.tool-versions
+++ b/.tool-versions
@ -1 +1 @@
-erlang 23.2.7.2-emqx-3
+erlang 23.3.4.9-3
--- a/2
+++ b/2
@ -4,7 +4,7 @@ REBAR = $(CURDIR)/rebar3
 BUILD = $(CURDIR)/build
 SCRIPTS = $(CURDIR)/scripts
 export EMQX_RELUP ?= true
-export EMQX_DEFAULT_BUILDER = emqx/build-env:erl23.2.7.2-emqx-3-alpine
+export EMQX_DEFAULT_BUILDER = emqx/build-env:erl23.3.4.9-3-alpine
 export EMQX_DEFAULT_RUNNER = alpine:3.12
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
 export DOCKERFILE := deploy/docker/Dockerfile
--- a/Windows.md
+++ b/Windows.md
@ -29,7 +29,7 @@ The second path is for CMD to setup environment variables.

 ### Erlang/OTP

-Install Erlang/OTP 23.2 from https://www.erlang.org/downloads
+Install Erlang/OTP 23.3 from https://www.erlang.org/downloads
 You may need to edit the `Path` environment variable to allow running
 Erlang commands such as `erl` from CMD.

--- a/apps/emqx_management/test/emqx_auth_mnesia_data_export_import_SUITE.erl
+++ b/apps/emqx_management/test/emqx_auth_mnesia_data_export_import_SUITE.erl
@ -70,4 +70,10 @@ remove_all_users_and_acl() ->
    mnesia:delete_table(emqx_user),
    mnesia:delete_table(emqx_acl).

+-else.
+
+%% opensource edition
+
+all() -> [].
+
 -endif.
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@ -2,17 +2,20 @@
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
  [{"4.3.19",
-    [{load_module,emqx_app,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
   {"4.3.18",
-    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]},
   {"4.3.17",
-    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
     {load_module,emqx,brutal_purge,soft_purge,[]},
     {load_module,emqx_exclusive_subscription,brutal_purge,soft_purge,[]},
@ -23,7 +26,8 @@
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
     {load_module,emqx_access_control,brutal_purge,soft_purge,[]}]},
   {"4.3.16",
-    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx,brutal_purge,soft_purge,[]},
     {load_module,emqx_session,brutal_purge,soft_purge,[]},
     {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]},
@ -697,17 +701,20 @@
     {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
   {<<".*">>,[]}],
  [{"4.3.19",
-    [{load_module,emqx_app,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
   {"4.3.18",
-    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]},
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]},
   {"4.3.17",
-    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
     {load_module,emqx,brutal_purge,soft_purge,[]},
     {load_module,emqx_exclusive_subscription,brutal_purge,soft_purge,[]},
@ -718,7 +725,8 @@
     {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
     {load_module,emqx_access_control,brutal_purge,soft_purge,[]}]},
   {"4.3.16",
-    [{load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_misc,brutal_purge,soft_purge,[]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
     {load_module,emqx,brutal_purge,soft_purge,[]},
     {load_module,emqx_session,brutal_purge,soft_purge,[]},
     {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]},
--- a/src/emqx_misc.erl
+++ b/src/emqx_misc.erl
@ -84,16 +84,9 @@ maybe_parse_ip(Host) ->

 %% @doc Add `ipv6_probe' socket option if it's supported.
 ipv6_probe(Opts) ->
-    case persistent_term:get({?MODULE, ipv6_probe_supported}, unknown) of
-        unknown ->
-            %% e.g. 23.2.7.1-emqx-2-x86_64-unknown-linux-gnu-64
-            OtpVsn = emqx_vm:get_otp_version(),
-            Bool = (match =:= re:run(OtpVsn, "emqx", [{capture, none}])),
-            _ = persistent_term:put({?MODULE, ipv6_probe_supported}, Bool),
-            ipv6_probe(Bool, Opts);
-        Bool ->
-            ipv6_probe(Bool, Opts)
-    end.
+    Bool = try gen_tcp:ipv6_probe()
+           catch _ : _ -> false end,
+    ipv6_probe(Bool, Opts).

 ipv6_probe(false, Opts) -> Opts;
 ipv6_probe(true, Opts) -> [{ipv6_probe, true} | Opts].
--- a/test/emqx_plugins_SUITE.erl
+++ b/test/emqx_plugins_SUITE.erl
@ -94,10 +94,8 @@ default_plugins() ->
    [
        {emqx_bridge_mqtt, false},
        {emqx_dashboard, true},
-        {emqx_eviction_agent, true},
        {emqx_management, true},
        {emqx_modules, false},
-        {emqx_node_rebalance, true},
        {emqx_recon, true},
        {emqx_retainer, true},
        {emqx_rule_engine, true},