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.

Sign up for GitHub

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

Jump to bottom

[DNM] Make CI green again! #3336

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[DNM] Make CI green again! #3336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions .drone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
execInnerDocker('mariadb -e "insert into test.t1 values (2); select * from test.t1"', dockerImage("smoke")),
],
},
upgrade(version):: {
upgrade(version, depends_arr):: {
name: 'upgrade-test from ' + version,
depends_on: ['smoke'],
depends_on: depends_arr,
image: 'docker',
failure: 'ignore',
volumes: [pipeline._volumes.docker],
Expand All @@ -375,7 +375,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
},
upgradelog:: {
name: 'upgradelog',
depends_on: std.map(function(p) 'upgrade-test from ' + p, mdb_server_versions),
depends_on: [if std.length(mdb_server_versions) == 0 then 'smoke' else 'upgrade-test from ' + mdb_server_versions[std.length(mdb_server_versions)-1]],
failure: 'ignore',
image: 'docker',
volumes: [pipeline._volumes.docker],
Expand All @@ -388,7 +388,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
},
mtr:: {
name: 'mtr',
depends_on: ['smoke'],
depends_on: [if std.length(mdb_server_versions) == 0 then 'smoke' else 'upgrade-test from ' + mdb_server_versions[std.length(mdb_server_versions)-1]],
image: 'docker:git',
volumes: [pipeline._volumes.docker],
environment: {
Expand Down Expand Up @@ -453,7 +453,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
},
prepare_regression:: {
name: 'prepare regression',
depends_on: ['mtr', 'publish pkg', 'publish cmapi build'],
depends_on: ['mtr'],
when: {
status: ['success', 'failure'],
},
Expand Down Expand Up @@ -575,7 +575,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
},
dockerfile:: {
name: 'dockerfile',
depends_on: ['publish pkg', 'publish cmapi build'],
depends_on: [if std.length(mdb_server_versions) == 0 then 'smoke' else 'upgrade-test from ' + mdb_server_versions[std.length(mdb_server_versions)-1]],
//failure: 'ignore',
image: 'alpine/git',
environment: {
Expand Down Expand Up @@ -672,7 +672,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
},
cmapitest:: {
name: 'cmapi test',
depends_on: ['publish cmapi build', 'smoke'],
depends_on: [if std.length(mdb_server_versions) == 0 then 'smoke' else 'upgrade-test from ' + mdb_server_versions[std.length(mdb_server_versions)-1]],
image: 'docker:git',
volumes: [pipeline._volumes.docker],
environment: {
Expand Down Expand Up @@ -724,7 +724,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
'docker exec -t mcs1 mariadb -e "create database if not exists test;"',
// delay for manual debugging on live instance
'sleep $${COMPOSE_DELAY_SECONDS:-1s}',
'docker exec -t mcs1 bash -c "cd ' + mtr_path + ' && ./mtr --extern socket=' + socket_path + ' --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/basic,columnstore/bugfixes"',
'docker exec -t mcs1 bash -c "cd ' + mtr_path + ' && ./mtr --skip-test=*mcol-5505-cpimport-parquet* --skip-test=fdb_api --extern socket=' + socket_path + ' --force --print-core=detailed --print-method=gdb --max-test-fail=0 --suite=columnstore/basic,columnstore/bugfixes"',
Copy link
Collaborator

Choose a reason for hiding this comment

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

@mariadb-AlanMologorsky We discussed you will disable those two only for rocky-8 b/c it fails running the tests with 3 nodes cluster.

Copy link
Collaborator

Choose a reason for hiding this comment

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

This skip arguments should are applied to multi_node_mtr step, that is exactly rocky-8 multinode

],
},

Expand All @@ -746,6 +746,7 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
},
{
name: 'clone-mdb',
depends_on: ['submodules'],
image: 'alpine/git',
volumes: [pipeline._volumes.mdb],
environment: {
Expand All @@ -766,9 +767,13 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
'cp -r /drone/src /mdb/' + builddir + '/storage/columnstore/columnstore',
],
},
] +
[pipeline.cmapipython] + [pipeline.cmapibuild] +
[pipeline.publish('cmapi build')] +
[
{
name: 'build',
depends_on: ['clone-mdb'],
depends_on: ['publish cmapi build'],
image: img,
volumes: [pipeline._volumes.mdb],
environment: {
Expand Down Expand Up @@ -857,8 +862,6 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
],
},
] +
[pipeline.cmapipython] + [pipeline.cmapibuild] +
[pipeline.publish('cmapi build')] +
[pipeline.publish()] +
[
{
Expand All @@ -877,10 +880,15 @@ local Pipeline(branch, platform, event, arch='amd64', server='10.6-enterprise')
[pipeline.smoke] +
[pipeline.smokelog] +
[pipeline.publish('smokelog')] +
[
pipeline.upgrade(
mdb_server_versions[i],
(if (i == 0) then ['smoke'] else ['upgrade-test from ' + mdb_server_versions[i-1]])
) for i in indexes(mdb_server_versions)
] +
[pipeline.cmapitest] +
[pipeline.cmapilog] +
[pipeline.publish('cmapilog')] +
[pipeline.upgrade(mdb_server_versions[i]) for i in indexes(mdb_server_versions)] +
(if (std.length(mdb_server_versions) == 0) then [] else [pipeline.upgradelog] + [pipeline.publish('upgradelog')]) +
(if (platform == 'rockylinux:8' && arch == 'amd64') then [pipeline.dockerfile] + [pipeline.dockerhub] + [pipeline.multi_node_mtr] else [pipeline.mtr] + [pipeline.publish('mtr')] + [pipeline.mtrlog] + [pipeline.publish('mtrlog')]) +
(if (event == 'cron' && platform == 'rockylinux:8' && arch == 'amd64') then [pipeline.publish('mtr latest', 'latest')] else []) +
Expand Down