Skip to content

Commit 8abe299

Browse files
authored
[CUBRIDQA-1314] merge develop branch to feature/system-catalog (#740)
* [CUBRIDQA-1314] add ENV_ keyword on manualtest job sender module. (#739) * add prebuilt jar files
1 parent 7cf1422 commit 8abe299

File tree

10 files changed

+2
-2
lines changed

10 files changed

+2
-2
lines changed
0 Bytes
Binary file not shown.

CTP/common/lib/cubridqa-common.jar

0 Bytes
Binary file not shown.
34 Bytes
Binary file not shown.

CTP/common/sched/src/com/navercorp/cubridqa/scheduler/producer/ManualSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ private static boolean acceptConfirm() throws IOException {
325325

326326
private static void showHelp() {
327327
System.out
328-
.println("Usage: java com.navercorp.cubridqa.scheduler.producer.ManualSender <queue> <url1,url2,...> <scenario> <priority> [compat_file|-i18nAll|-dbimgAll|-compatAll] [PROPS:MKEY_TEST1=v1;MKEY_TEST2=v2]");
328+
.println("Usage: java com.navercorp.cubridqa.scheduler.producer.ManualSender <queue> <url1,url2,...> <scenario> <priority> [compat_file|-i18nAll|-dbimgAll|-compatAll] [PROPS:MKEY_TEST1=v1;MKEY_TEST2=v2|ENV_TEST1=v1;ENV_TEST2=v2]");
329329
System.out.println();
330330
}
331331

CTP/common/sched/src/com/navercorp/cubridqa/scheduler/producer/crontab/CUBJob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ private boolean processTest(CUBJobContext jctx, File buildRootFile, Properties t
193193
while (it.hasNext()) {
194194
key = it.next().trim();
195195
value = testProps.getProperty(key);
196-
if (key.startsWith("MKEY_")) {
196+
if (key.startsWith("MKEY_") || key.startsWith("ENV_")) {
197197
msgProps.put(key, value);
198198
}
199199
}
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

CTP/shell/lib/cubridqa-shell.jar

0 Bytes
Binary file not shown.

CTP/sql/lib/cubridqa-cqt.jar

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)