Skip to content

Commit 7a33770

Browse files
more debug
1 parent eaf7b8d commit 7a33770

File tree

1 file changed

+14
-29
lines changed

1 file changed

+14
-29
lines changed

.drone.jsonnet

Lines changed: 14 additions & 29 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",
@@ -182,7 +186,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
182186

183187
"aws s3 sync " + result + " s3://cspkg/" + branchp + eventp + "/" + server + "/" + arch + "/" + result + " --only-show-errors",
184188
'echo "Data uploaded to: ' + publish_pkg_url + '"',
185-
189+
make_clickable_link(publish_pkg_url),
186190
"rm -rf " + result + "/*",
187191
],
188192
},
@@ -327,7 +331,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
327331
MTR_FULL_SUITE: "${MTR_FULL_SUITE:-false}",
328332
},
329333
commands: [
330-
"echo running on ${DRONE_STAGE_MACHINE}",
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")),
@@ -367,7 +370,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
367370
image: "docker",
368371
volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
369372
commands: [
370-
"echo running on ${DRONE_STAGE_MACHINE}",
371373
reportTestStage(getContainerName("mtr"), result, "mtr"),
372374
],
373375
when: {
@@ -387,7 +389,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
387389
REGRESSION_REF_AUX: branch_ref,
388390
},
389391
commands: [
390-
"echo running on ${DRONE_STAGE_MACHINE}",
391392
// compute branch.
392393
'echo "$$REGRESSION_REF"',
393394
'echo "$$REGRESSION_BRANCH_REF"',
@@ -445,7 +446,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
445446
},
446447
},
447448
commands: [
448-
"echo running on ${DRONE_STAGE_MACHINE}",
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")),
@@ -596,7 +596,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
596596
name: "submodules",
597597
image: "alpine/git",
598598
commands: [
599-
"echo running on ${DRONE_STAGE_MACHINE}",
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,8 @@ 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 +
614+
[
616615
"echo $$SERVER_REF",
617616
"echo $$SERVER_REMOTE",
618617
"mkdir -p /mdb/" + builddir + " && cd /mdb/" + builddir,
@@ -645,13 +644,13 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
645644
//SCCACHE_ERROR_LOG: '/tmp/sccache_log.txt',
646645
//SCCACHE_LOG: 'debug',
647646
},
648-
commands: [
649-
"echo running on ${DRONE_STAGE_MACHINE}",
650-
"mkdir /mdb/" + builddir + "/" + result,
651-
get_sccache,
652-
]
653-
+ customEnvCommands(customBuildEnvCommandsMapKey, builddir) +
654-
[
647+
commands:
648+
[
649+
"mkdir /mdb/" + builddir + "/" + result,
650+
get_sccache,
651+
]
652+
+ customEnvCommands(customBuildEnvCommandsMapKey, builddir) +
653+
[
655654
'bash -c "set -o pipefail && bash /mdb/' + builddir + "/storage/columnstore/columnstore/build/bootstrap_mcs.sh " +
656655
"--build-type RelWithDebInfo " +
657656
"--distro " + platform + " " +
@@ -714,7 +713,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
714713
SERVER_REMOTE: "${SERVER_REMOTE:-" + server_remote + "}",
715714
},
716715
commands: [
717-
"echo running on ${DRONE_STAGE_MACHINE}",
718716
"cd /mdb/" + builddir,
719717
'echo "engine: $DRONE_COMMIT" > buildinfo.txt',
720718
'echo "server: $$(git rev-parse HEAD)" >> buildinfo.txt',
@@ -733,19 +731,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
733731
] +
734732
[pipeline.publish("cmapi build")] +
735733
[pipeline.publish()] +
736-
[
737-
{
738-
name: "publish pkg url",
739-
depends_on: ["publish pkg"],
740-
image: "alpine/git",
741-
commands: [
742-
"echo -e '\\e]8;;" + publish_pkg_url + "\\e\\\\" + publish_pkg_url + "\\e]8;;\\e\\\\'",
743-
"echo 'for installation run:'",
744-
"echo 'export OS=" + result + "'",
745-
"echo 'export PACKAGES_URL=" + packages_url + "'",
746-
],
747-
},
748-
] +
749734
(if (event == "cron") then [pipeline.publish("pkg latest", "latest")] else []) +
750735
[pipeline.smoke] +
751736
[pipeline.smokelog] +

0 commit comments

Comments
 (0)