Skip to content

Commit f1c042f

Browse files
Use fast tpc-h generator
1 parent 736ec81 commit f1c042f

File tree

2 files changed

+58
-57
lines changed

2 files changed

+58
-57
lines changed

.drone.jsonnet

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ local customBuildFlags(buildKey) =
6565
local any_branch = "**";
6666

6767

68-
local mtr_suite_list = "basic,bugfixes";
69-
local mtr_full_set = "basic,bugfixes,devregression,autopilot,extended,multinode,oracle,1pmonly";
68+
local mtr_suite_list = "basic,bugfixes,future";
69+
local mtr_full_set = "basic,bugfixes,future,devregression,autopilot,extended,multinode,oracle,1pmonly";
7070

7171
local upgrade_test_lists = {
7272
rockylinux8: {
@@ -646,40 +646,40 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
646646

647647

648648
local AllPipelines =
649-
[
650-
Pipeline(b, platform, triggeringEvent, a, server, flag, "")
651-
for a in ["amd64"]
652-
for b in std.objectFields(platforms)
653-
for platform in ["rockylinux:8"]
654-
for flag in ["gcc-toolset"]
655-
for triggeringEvent in events
656-
for server in servers[current_branch]
657-
] +
658-
[
659-
Pipeline(b, p, e, a, s)
660-
for b in std.objectFields(platforms)
661-
for p in platforms[b]
662-
for s in servers[b]
663-
for e in events
664-
for a in archs
665-
] +
666-
[
667-
Pipeline(any_branch, p, "custom", a, server)
668-
for p in platforms[current_branch]
669-
for server in servers[current_branch]
670-
for a in archs
671-
] +
672-
// clang
673-
[
674-
Pipeline(b, platform, triggeringEvent, a, server, "", buildenv)
675-
for a in ["amd64"]
676-
for b in std.objectFields(platforms)
677-
for platform in ["ubuntu:24.04"]
678-
for buildenv in std.objectFields(customEnvCommandsMap)
679-
for triggeringEvent in events
680-
for server in servers[current_branch]
681-
] +
682-
// last argument is to ignore mtr and regression failures
649+
// [
650+
// Pipeline(b, platform, triggeringEvent, a, server, flag, "")
651+
// for a in ["amd64"]
652+
// for b in std.objectFields(platforms)
653+
// for platform in ["rockylinux:8"]
654+
// for flag in ["gcc-toolset"]
655+
// for triggeringEvent in events
656+
// for server in servers[current_branch]
657+
// ] +
658+
// [
659+
// Pipeline(b, p, e, a, s)
660+
// for b in std.objectFields(platforms)
661+
// for p in platforms[b]
662+
// for s in servers[b]
663+
// for e in events
664+
// for a in archs
665+
// ] +
666+
// [
667+
// Pipeline(any_branch, p, "custom", a, server)
668+
// for p in platforms[current_branch]
669+
// for server in servers[current_branch]
670+
// for a in archs
671+
// ] +
672+
// // clang
673+
// [
674+
// Pipeline(b, platform, triggeringEvent, a, server, "", buildenv)
675+
// for a in ["amd64"]
676+
// for b in std.objectFields(platforms)
677+
// for platform in ["ubuntu:24.04"]
678+
// for buildenv in std.objectFields(customEnvCommandsMap)
679+
// for triggeringEvent in events
680+
// for server in servers[current_branch]
681+
// ] +
682+
// // last argument is to ignore mtr and regression failures
683683
[
684684
Pipeline(b, platform, triggeringEvent, a, server, "", "", ["regression", "mtr"])
685685
for a in ["amd64"]
@@ -689,26 +689,26 @@ local AllPipelines =
689689
for server in extra_servers[current_branch]
690690
] +
691691
// // last argument is to ignore mtr and regression failures
692-
[
693-
Pipeline(b, platform, triggeringEvent, a, server, flag, envcommand, ["regression", "mtr"])
694-
for a in ["amd64"]
695-
for b in std.objectFields(platforms)
696-
for platform in ["ubuntu:24.04"]
697-
for flag in ["libcpp"]
698-
for envcommand in ["clang-20"]
699-
for triggeringEvent in events
700-
for server in servers[current_branch]
701-
] +
702-
// last argument is to ignore mtr and regression failures
703-
[
704-
Pipeline(b, platform, triggeringEvent, a, server, flag, "", ["regression", "mtr"])
705-
for a in ["amd64"]
706-
for b in std.objectFields(platforms)
707-
for platform in ["ubuntu:24.04"]
708-
for flag in ["ASan", "UBSan"]
709-
for triggeringEvent in events
710-
for server in servers[current_branch]
711-
] +
692+
// [
693+
// Pipeline(b, platform, triggeringEvent, a, server, flag, envcommand, ["regression", "mtr"])
694+
// for a in ["amd64"]
695+
// for b in std.objectFields(platforms)
696+
// for platform in ["ubuntu:24.04"]
697+
// for flag in ["libcpp"]
698+
// for envcommand in ["clang-20"]
699+
// for triggeringEvent in events
700+
// for server in servers[current_branch]
701+
// ] +
702+
// // last argument is to ignore mtr and regression failures
703+
// [
704+
// Pipeline(b, platform, triggeringEvent, a, server, flag, "", ["regression", "mtr"])
705+
// for a in ["amd64"]
706+
// for b in std.objectFields(platforms)
707+
// for platform in ["ubuntu:24.04"]
708+
// for flag in ["ASan", "UBSan"]
709+
// for triggeringEvent in events
710+
// for server in servers[current_branch]
711+
// ] +
712712

713713
[];
714714

build/prepare_test_container.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ prepare_container() {
120120
execInnerDockerWithRetry "$CONTAINER_NAME" 'yum --nobest update -y && yum --nobest install -y cracklib-dicts diffutils elfutils epel-release expect findutils iproute gawk gcc-c++ gdb hostname lz4 patch perl procps-ng rsyslog sudo tar wget which'
121121
else
122122
change_ubuntu_mirror_in_docker "$CONTAINER_NAME" "us"
123-
execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y elfutils expect findutils iproute2 g++ gawk gdb hostname liblz4-tool patch procps rsyslog sudo tar wget'
123+
execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y rustup elfutils expect findutils iproute2 g++ gawk gdb hostname liblz4-tool patch procps rsyslog sudo tar wget'
124+
execInnerDockerWithRetry "$CONTAINER_NAME" 'rustup install 1.85.0 && cargo install tpchgen-cli'
124125
fi
125126

126127
# Configure core dump naming pattern

0 commit comments

Comments
 (0)