Skip to content

Commit 287cf73

Browse files
more debug
1 parent eaf7b8d commit 287cf73

File tree

1 file changed

+18
-21
lines changed

1 file changed

+18
-21
lines changed

.drone.jsonnet

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ local testPreparation(platform) =
127127
};
128128
platform_map[platform];
129129

130+
local make_clickable_link(link) = "echo -e '\\e]8;;" + link + "\\e\\\\" + link + "\\e]8;;\\e\\\\'";
131+
local echo_running_on = ["echo running on ${DRONE_STAGE_MACHINE}",
132+
make_clickable_link("https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#Instances:search=:${DRONE_STAGE_MACHINE};v=3;$case=tags:true%5C,client:false;$regex=tags:false%5C,client:false;sort=desc:launchTime")];
133+
130134
local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise", customBootstrapParams="", customBuildEnvCommandsMapKey="") = {
131135
local pkg_format = if (std.split(platform, ":")[0] == "rockylinux") then "rpm" else "deb",
132136
local init = if (pkg_format == "rpm") then "/usr/lib/systemd/systemd" else "systemd",
@@ -326,8 +330,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
326330
MTR_SUITE_LIST: "${MTR_SUITE_LIST:-" + mtr_suite_list + "}",
327331
MTR_FULL_SUITE: "${MTR_FULL_SUITE:-false}",
328332
},
329-
commands: [
330-
"echo running on ${DRONE_STAGE_MACHINE}",
333+
commands: echo_running_on + [
331334
prepareTestStage(getContainerName("mtr"), result, true),
332335
"docker cp mysql-test/columnstore mtr$${DRONE_BUILD_NUMBER}:" + mtr_path + "/suite/",
333336
execInnerDocker("chown -R mysql:mysql " + mtr_path, getContainerName("mtr")),
@@ -366,8 +369,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
366369
depends_on: ["mtr"],
367370
image: "docker",
368371
volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
369-
commands: [
370-
"echo running on ${DRONE_STAGE_MACHINE}",
372+
commands: echo_running_on + [
371373
reportTestStage(getContainerName("mtr"), result, "mtr"),
372374
],
373375
when: {
@@ -386,8 +388,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
386388
REGRESSION_BRANCH_REF: "${DRONE_SOURCE_BRANCH}",
387389
REGRESSION_REF_AUX: branch_ref,
388390
},
389-
commands: [
390-
"echo running on ${DRONE_STAGE_MACHINE}",
391+
commands: echo_running_on + [
391392
// compute branch.
392393
'echo "$$REGRESSION_REF"',
393394
'echo "$$REGRESSION_BRANCH_REF"',
@@ -444,8 +445,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
444445
from_secret: "regression_timeout",
445446
},
446447
},
447-
commands: [
448-
"echo running on ${DRONE_STAGE_MACHINE}",
448+
commands: echo_running_on + [
449449
execInnerDocker("mkdir -p reg-logs", getContainerName("regression"), "--workdir /mariadb-columnstore-regression-test/mysql/queries/nightly/alltest"),
450450
execInnerDocker("bash -c 'sleep 4800 && bash /save_stack.sh /mariadb-columnstore-regression-test/mysql/queries/nightly/alltest/reg-logs/' & ",
451451
getContainerName("regresion")),
@@ -595,8 +595,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
595595
{
596596
name: "submodules",
597597
image: "alpine/git",
598-
commands: [
599-
"echo running on ${DRONE_STAGE_MACHINE}",
598+
commands: echo_running_on + [
600599
"git submodule update --init --recursive",
601600
"git config cmake.update-submodules no",
602601
"git rev-parse --abbrev-ref HEAD && git rev-parse HEAD",
@@ -611,8 +610,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
611610
SERVER_REMOTE: "${SERVER_REMOTE:-" + server_remote + "}",
612611
SERVER_SHA: "${SERVER_SHA:-" + server + "}",
613612
},
614-
commands: [
615-
"echo running on ${DRONE_STAGE_MACHINE}",
613+
commands: echo_running_on + [
616614
"echo $$SERVER_REF",
617615
"echo $$SERVER_REMOTE",
618616
"mkdir -p /mdb/" + builddir + " && cd /mdb/" + builddir,
@@ -645,13 +643,13 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
645643
//SCCACHE_ERROR_LOG: '/tmp/sccache_log.txt',
646644
//SCCACHE_LOG: 'debug',
647645
},
648-
commands: [
649-
"echo running on ${DRONE_STAGE_MACHINE}",
650-
"mkdir /mdb/" + builddir + "/" + result,
651-
get_sccache,
652-
]
653-
+ customEnvCommands(customBuildEnvCommandsMapKey, builddir) +
654-
[
646+
commands: echo_running_on +
647+
[
648+
"mkdir /mdb/" + builddir + "/" + result,
649+
get_sccache,
650+
]
651+
+ customEnvCommands(customBuildEnvCommandsMapKey, builddir) +
652+
[
655653
'bash -c "set -o pipefail && bash /mdb/' + builddir + "/storage/columnstore/columnstore/build/bootstrap_mcs.sh " +
656654
"--build-type RelWithDebInfo " +
657655
"--distro " + platform + " " +
@@ -713,8 +711,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
713711
SERVER_REF: "${SERVER_REF:-" + server + "}",
714712
SERVER_REMOTE: "${SERVER_REMOTE:-" + server_remote + "}",
715713
},
716-
commands: [
717-
"echo running on ${DRONE_STAGE_MACHINE}",
714+
commands: echo_running_on + [
718715
"cd /mdb/" + builddir,
719716
'echo "engine: $DRONE_COMMIT" > buildinfo.txt',
720717
'echo "server: $$(git rev-parse HEAD)" >> buildinfo.txt',

0 commit comments

Comments
 (0)