Merge pull request #10138 from id/ci-tmp-fix-for-build-packages

ci: tmp fix for build packages
This commit is contained in:
Ivan Dyachkov 2023-03-14 20:05:20 +00:00 committed by GitHub
commit 5b87a17329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions

View File

@ -213,8 +213,6 @@ jobs:
- ubuntu18.04 - ubuntu18.04
- debian11 - debian11
- debian10 - debian10
- raspbian10
- raspbian9
- el9 - el9
- el8 - el8
- el7 - el7
@ -231,10 +229,6 @@ jobs:
build_machine: ubuntu-22.04 build_machine: ubuntu-22.04
- arch: amd64 - arch: amd64
build_machine: aws-arm64 build_machine: aws-arm64
- arch: amd64
os: raspbian9
- arch: amd64
os: raspbian10
include: include:
- profile: emqx - profile: emqx
otp: 25.1.2-2 otp: 25.1.2-2
@ -266,6 +260,11 @@ jobs:
path: . path: .
- name: unzip source code - name: unzip source code
run: unzip -q source.zip run: unzip -q source.zip
- name: tmp fix for el9
if: matrix.os == 'el9'
run: |
set -eu
dnf install -y krb5-devel
- name: build emqx packages - name: build emqx packages
working-directory: source working-directory: source
env: env:
@ -378,8 +377,6 @@ jobs:
push "debian/buster" "packages/$PROFILE/$PROFILE-$VERSION-debian10-arm64.deb" push "debian/buster" "packages/$PROFILE/$PROFILE-$VERSION-debian10-arm64.deb"
push "debian/bullseye" "packages/$PROFILE/$PROFILE-$VERSION-debian11-amd64.deb" push "debian/bullseye" "packages/$PROFILE/$PROFILE-$VERSION-debian11-amd64.deb"
push "debian/bullseye" "packages/$PROFILE/$PROFILE-$VERSION-debian11-arm64.deb" push "debian/bullseye" "packages/$PROFILE/$PROFILE-$VERSION-debian11-arm64.deb"
push "raspbian/stretch" "packages/$PROFILE/$PROFILE-$VERSION-raspbian9-arm64.deb"
push "raspbian/buster" "packages/$PROFILE/$PROFILE-$VERSION-raspbian10-arm64.deb"
push "ubuntu/bionic" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu18.04-amd64.deb" push "ubuntu/bionic" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu18.04-amd64.deb"
push "ubuntu/bionic" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu18.04-arm64.deb" push "ubuntu/bionic" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu18.04-arm64.deb"
push "ubuntu/focal" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu20.04-amd64.deb" push "ubuntu/focal" "packages/$PROFILE/$PROFILE-$VERSION-ubuntu20.04-amd64.deb"

View File

@ -190,6 +190,7 @@ end_per_group(_, Config) ->
init_per_testcase(_, Config) -> init_per_testcase(_, Config) ->
emqx_common_test_helpers:start_apps([]), emqx_common_test_helpers:start_apps([]),
start_emqx_quic(?config(port, Config)),
Config. Config.
t_quic_sock(Config) -> t_quic_sock(Config) ->
@ -1255,7 +1256,8 @@ t_multi_streams_shutdown_pub_data_stream(Config) ->
}} }}
], ],
PubRecvs PubRecvs
). ),
emqtt:stop(C).
t_multi_streams_shutdown_sub_data_stream(Config) -> t_multi_streams_shutdown_sub_data_stream(Config) ->
PubQos = ?config(pub_qos, Config), PubQos = ?config(pub_qos, Config),
@ -1302,7 +1304,8 @@ t_multi_streams_shutdown_sub_data_stream(Config) ->
#{data_stream_socks := [_PubVia | _]} = proplists:get_value(extra, emqtt:info(C)), #{data_stream_socks := [_PubVia | _]} = proplists:get_value(extra, emqtt:info(C)),
timer:sleep(500), timer:sleep(500),
%% Still alive %% Still alive
?assert(is_list(emqtt:info(C))). ?assert(is_list(emqtt:info(C))),
emqtt:stop(C).
t_multi_streams_shutdown_ctrl_stream(Config) -> t_multi_streams_shutdown_ctrl_stream(Config) ->
PubQos = ?config(pub_qos, Config), PubQos = ?config(pub_qos, Config),
@ -1406,7 +1409,8 @@ t_multi_streams_shutdown_ctrl_stream_then_reconnect(Config) ->
quicer:shutdown_stream(Ctrlstream, ?config(stream_shutdown_flag, Config), 500, 100), quicer:shutdown_stream(Ctrlstream, ?config(stream_shutdown_flag, Config), 500, 100),
timer:sleep(200), timer:sleep(200),
%% Client should not be closed %% Client should not be closed
?assert(is_list(emqtt:info(C))). ?assert(is_list(emqtt:info(C))),
emqtt:stop(C).
t_multi_streams_emqx_ctrl_kill(Config) -> t_multi_streams_emqx_ctrl_kill(Config) ->
erlang:process_flag(trap_exit, true), erlang:process_flag(trap_exit, true),
@ -1526,6 +1530,7 @@ t_multi_streams_remote_shutdown(Config) ->
{ok, C} = emqtt:start_link([ {ok, C} = emqtt:start_link([
{proto_ver, v5}, {proto_ver, v5},
{reconnect, false}, {reconnect, false},
{clientid, atom_to_binary(?FUNCTION_NAME)},
%% speedup test %% speedup test
{connect_timeout, 5} {connect_timeout, 5}
| Config | Config
@ -1563,7 +1568,6 @@ t_multi_streams_remote_shutdown(Config) ->
{quic, _Conn, _Ctrlstream} = proplists:get_value(socket, emqtt:info(C)), {quic, _Conn, _Ctrlstream} = proplists:get_value(socket, emqtt:info(C)),
ok = stop_emqx(), ok = stop_emqx(),
start_emqx_quic(?config(port, Config)),
%% Client should be closed %% Client should be closed
assert_client_die(C). assert_client_die(C).
@ -1620,10 +1624,9 @@ t_multi_streams_remote_shutdown_with_reconnect(Config) ->
ok = stop_emqx(), ok = stop_emqx(),
timer:sleep(200), timer:sleep(200),
start_emqx_quic(?config(port, Config)), start_emqx_quic(?config(port, Config)),
%% Client should be closed ?assert(is_list(emqtt:info(C))),
?assert(is_list(emqtt:info(C))). emqtt:stop(C).
t_conn_silent_close(Config) -> t_conn_silent_close(Config) ->
erlang:process_flag(trap_exit, true), erlang:process_flag(trap_exit, true),
@ -1906,8 +1909,9 @@ t_listener_with_lowlevel_settings(_Config) ->
%% not use since we are server %% not use since we are server
%% tls_client_max_send_buffer, %% tls_client_max_send_buffer,
tls_server_max_send_buffer => 10240, tls_server_max_send_buffer => 10240,
stream_recv_window_default => 1024, stream_recv_window_default => 16384 * 2,
stream_recv_buffer_default => 10240, %% there is one debug assertion: stream_recv_window_default > stream_recv_buffer_default
stream_recv_buffer_default => 16384,
conn_flow_control_window => 1024, conn_flow_control_window => 1024,
max_stateless_operations => 16, max_stateless_operations => 16,
initial_window_packets => 1300, initial_window_packets => 1300,