Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use arm docker executor instead of running docker manually #4145

Merged
merged 5 commits into from
Oct 13, 2023

Conversation

chrzaszcz
Copy link
Member

@chrzaszcz chrzaszcz commented Oct 11, 2023

CircleCI supports Docker Arm executors now, and this PR makes use of them.

Previously there were separate jobs for Arm, because Docker was run manually on a machine executor.
New se can reuse the build_in_docker, small_tests_in_docker and docker_smoke_test jobs.

It turned out that the machine Arm executor was capable of running x86_64 code, while the new Docker executor is not, so correct binaries are downloaded now.

The next step would be to enable a big test preset for Arm, but we will do it separately.

@mongoose-im

This comment was marked as outdated.

@codecov
Copy link

codecov bot commented Oct 11, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (f0173c0) 84.05% compared to head (c075882) 84.02%.
Report is 4 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4145      +/-   ##
==========================================
- Coverage   84.05%   84.02%   -0.03%     
==========================================
  Files         561      561              
  Lines       34050    34050              
==========================================
- Hits        28621    28612       -9     
- Misses       5429     5438       +9     

see 8 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@chrzaszcz chrzaszcz force-pushed the use-arm-docker-executor branch 2 times, most recently from 20e7c8b to 26a48ee Compare October 11, 2023 11:42
@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@mongoose-im

This comment was marked as outdated.

@chrzaszcz chrzaszcz changed the base branch from master to fix-small-tests October 12, 2023 10:33
@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 12, 2023

elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / 0c0d317
Reports root/ big
OK: 369 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0


small_tests_25 / small_tests / 0c0d317
Reports root / small


small_tests_26 / small_tests / 0c0d317
Reports root / small


small_tests_26_arm64 / small_tests / 0c0d317
Reports root / small


ldap_mnesia_25 / ldap_mnesia / 0c0d317
Reports root/ big
OK: 2303 / Failed: 0 / User-skipped: 865 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 0c0d317
Reports root/ big
OK: 4268 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0


ldap_mnesia_26 / ldap_mnesia / 0c0d317
Reports root/ big
OK: 2303 / Failed: 0 / User-skipped: 865 / Auto-skipped: 0


dynamic_domains_mysql_redis_26 / mysql_redis / 0c0d317
Reports root/ big
OK: 4236 / Failed: 0 / User-skipped: 144 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 0c0d317
Reports root/ big
OK: 4268 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0


internal_mnesia_26 / internal_mnesia / 0c0d317
Reports root/ big
OK: 2453 / Failed: 0 / User-skipped: 715 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 0c0d317
Reports root/ big
OK: 4657 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / 0c0d317
Reports root/ big
OK: 4265 / Failed: 0 / User-skipped: 115 / Auto-skipped: 0


pgsql_cets_26 / pgsql_cets / 0c0d317
Reports root/ big
OK: 4655 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0


mysql_redis_26 / mysql_redis / 0c0d317
Reports root/ big
OK: 4637 / Failed: 0 / User-skipped: 139 / Auto-skipped: 0


mssql_mnesia_26 / odbc_mssql_mnesia / 0c0d317
Reports root/ big
OK: 4654 / Failed: 0 / User-skipped: 122 / Auto-skipped: 0


pgsql_mnesia_26 / pgsql_mnesia / 0c0d317
Reports root/ big
OK: 4657 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0

Base automatically changed from fix-small-tests to master October 12, 2023 11:29
Previously there were no docker executors for arm, so we had to use
the machine ones.

Now the same jobs can be reused for both architectures.
The machine executor was apparently able to run x86_64 images as well.
The machine arm executor was able to run the x86_64 code,
while the docker one is not.
@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 12, 2023

elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / 5c8a61c
Reports root/ big
OK: 369 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0


small_tests_25 / small_tests / 5c8a61c
Reports root / small


small_tests_26 / small_tests / 5c8a61c
Reports root / small


small_tests_26_arm64 / small_tests / 5c8a61c
Reports root / small


ldap_mnesia_25 / ldap_mnesia / 5c8a61c
Reports root/ big
OK: 2303 / Failed: 0 / User-skipped: 865 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 5c8a61c
Reports root/ big
OK: 4268 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0


ldap_mnesia_26 / ldap_mnesia / 5c8a61c
Reports root/ big
OK: 2303 / Failed: 0 / User-skipped: 865 / Auto-skipped: 0


dynamic_domains_mysql_redis_26 / mysql_redis / 5c8a61c
Reports root/ big
OK: 4236 / Failed: 0 / User-skipped: 144 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 5c8a61c
Reports root/ big
OK: 4268 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0


internal_mnesia_26 / internal_mnesia / 5c8a61c
Reports root/ big
OK: 2453 / Failed: 0 / User-skipped: 715 / Auto-skipped: 0


pgsql_cets_26 / pgsql_cets / 5c8a61c
Reports root/ big
OK: 4655 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / 5c8a61c
Reports root/ big
OK: 4657 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / 5c8a61c
Reports root/ big
OK: 4265 / Failed: 0 / User-skipped: 115 / Auto-skipped: 0


mssql_mnesia_26 / odbc_mssql_mnesia / 5c8a61c
Reports root/ big
OK: 4653 / Failed: 1 / User-skipped: 122 / Auto-skipped: 0

muc_SUITE:register:user_changes_nick
{error,
  {{assertion_failed,assert,is_iq_result,
     [{xmlel,<<"iq">>,
        [{<<"type">>,<<"set">>},
         {<<"id">>,<<"8ce47f21a0f2d278366ab4fa59979328">>},
         {<<"to">>,<<"muc.localhost">>}],
        [{xmlel,<<"query">>,
           [{<<"xmlns">>,<<"jabber:iq:register">>}],
           [{xmlel,<<"x">>,
            [{<<"xmlns">>,<<"jabber:x:data">>},
             {<<"type">>,<<"submit">>}],
            [{xmlel,<<"field">>,
               [{<<"type">>,<<"hidden">>},
                {<<"var">>,<<"FORM_TYPE">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,<<"jabber:iq:register">>}]}]},
             {xmlel,<<"field">>,
               [{<<"type">>,<<"text-single">>},
                {<<"var">>,<<"nick">>}],
               [{xmlel,<<"value">>,[],
                  [{xmlcdata,
                     <<"thirdwitch1room-bf6ef92a13">>}]}]}]}]}]}],
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"muc.localhost">>},
        {<<"to">>,<<"alice_user_changes_nick_2672@localhost/res1">>},
        {<<"type">>,<<"error">>},
        {<<"id">>,<<"8ce47f21a0f2d278366ab4fa59979328">>}],
       [{xmlel,<<"query">>,
          [{<<"xmlns">>,<<"jabber:iq:register">>}],
          [{xmlel,<<"x">>,
             [{<<"xmlns">>,<<"jabber:x:data">>},
            {<<"type">>,<<"submit">>}],
             [{xmlel,<<"field">>,
              [{<<"type">>,<<"hidden">>},
               {<<"var">>,<<"FORM_TYPE">>}],
              [{xmlel,<<"value">>,[],
                 [{xmlcdata,<<"...

Report log


mysql_redis_26 / mysql_redis / 5c8a61c
Reports root/ big
OK: 4636 / Failed: 1 / User-skipped: 139 / Auto-skipped: 0

carboncopy_SUITE:one2one:dropped_client_doesnt_create_duplicate_carbons
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_dropped_client_doesnt_create_duplicate_carbons_575@localhost">>},
         {<<"to">>,
        <<"alice_dropped_client_doesnt_create_duplicate_carbons_575@localhost/res2">>},
         {<<"xmlns">>,<<"jabber:client">>},
         {<<"type">>,<<"chat">>}],
        [{xmlel,<<"sent">>,
           [{<<"xmlns">>,<<"urn:xmpp:carbons:2">>}],
           [{xmlel,<<"forwarded">>,
            [{<<"xmlns">>,<<"urn:xmpp:forward:0">>}],
            [{xmlel,<<"message">>,
               [{<<"from">>,
                 <<"alice_dropped_client_doesnt_create_duplicate_carbons_575@localhost/res1">>},
                {<<"type">>,<<"chat">>},
                {<<"to">>,
                 <<"bob_dropped_client_doesnt_create_duplicate_carbons_575@localhost/res1">>},
                {<<"xmlns">>,<<"jabber:client">>}],
               [{xmlel,<<"body">>,[],
                  [{xmlcdata,
                     <<"And pious action">>}]}]}]}]}]}]},
   [{carboncopy_SUITE,
      '-dropped_client_doesnt_create_duplicate_carbons/1-fun-0-',4,
      [{file,
         "/home/circleci/project/big_tests/tests/carboncopy_SUITE.erl"},
       {line,189}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_serv...

Report log


pgsql_mnesia_26 / pgsql_mnesia / 5c8a61c
Reports root/ big
OK: 4657 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0


mysql_redis_26 / mysql_redis / 5c8a61c
Reports root/ big
OK: 4637 / Failed: 0 / User-skipped: 139 / Auto-skipped: 0


mssql_mnesia_26 / odbc_mssql_mnesia / 5c8a61c
Reports root/ big
OK: 4654 / Failed: 0 / User-skipped: 122 / Auto-skipped: 0

@chrzaszcz chrzaszcz marked this pull request as ready for review October 12, 2023 12:48
Copy link
Collaborator

@DenysGonchar DenysGonchar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 13, 2023

elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / c075882
Reports root/ big
OK: 369 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0


small_tests_25 / small_tests / c075882
Reports root / small


small_tests_26 / small_tests / c075882
Reports root / small


small_tests_26_arm64 / small_tests / c075882
Reports root / small


ldap_mnesia_25 / ldap_mnesia / c075882
Reports root/ big
OK: 2303 / Failed: 0 / User-skipped: 865 / Auto-skipped: 0


ldap_mnesia_26 / ldap_mnesia / c075882
Reports root/ big
OK: 2303 / Failed: 0 / User-skipped: 865 / Auto-skipped: 0


dynamic_domains_mysql_redis_26 / mysql_redis / c075882
Reports root/ big
OK: 4236 / Failed: 0 / User-skipped: 144 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / c075882
Reports root/ big
OK: 4268 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / c075882
Reports root/ big
OK: 4268 / Failed: 0 / User-skipped: 112 / Auto-skipped: 0


pgsql_mnesia_25 / pgsql_mnesia / c075882
Reports root/ big
OK: 4657 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0


internal_mnesia_26 / internal_mnesia / c075882
Reports root/ big
OK: 2453 / Failed: 0 / User-skipped: 715 / Auto-skipped: 0


mysql_redis_26 / mysql_redis / c075882
Reports root/ big
OK: 4637 / Failed: 0 / User-skipped: 139 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / c075882
Reports root/ big
OK: 4265 / Failed: 0 / User-skipped: 115 / Auto-skipped: 0


pgsql_cets_26 / pgsql_cets / c075882
Reports root/ big
OK: 4655 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0


pgsql_mnesia_26 / pgsql_mnesia / c075882
Reports root/ big
OK: 4657 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0


mssql_mnesia_26 / odbc_mssql_mnesia / c075882
Reports root/ big
OK: 4654 / Failed: 0 / User-skipped: 122 / Auto-skipped: 0

@DenysGonchar DenysGonchar merged commit f358d08 into master Oct 13, 2023
4 checks passed
@DenysGonchar DenysGonchar deleted the use-arm-docker-executor branch October 13, 2023 15:03
@chrzaszcz chrzaszcz added this to the 6.2.0 milestone Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants