This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-11880
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-11880 by this push:
new c540194 IGNITE-11880: Configurable notifications by build
parameters/suite IDS & names
c540194 is described below
commit c540194198bd6d28c2117a4f6ed6f7bede1ce080
Author: Dmitriy Pavlov <[email protected]>
AuthorDate: Thu May 30 19:11:15 2019 +0300
IGNITE-11880: Configurable notifications by build parameters/suite IDS &
names
---
.../org/apache/ignite/ci/analysis/SingleBuildRunCtx.java | 13 +++++++++----
.../main/java/org/apache/ignite/ci/web/model/Version.java | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/SingleBuildRunCtx.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/SingleBuildRunCtx.java
index 2d38530..7970606 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/SingleBuildRunCtx.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/SingleBuildRunCtx.java
@@ -29,6 +29,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
+import java.util.regex.Pattern;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
import org.apache.ignite.ci.ITeamcity;
@@ -285,11 +286,10 @@ public class SingleBuildRunCtx implements ISuiteResults {
parm.selection().stream()
.filter(pvs -> {
- String valueRegExp = pvs.valueRegExp();
+ String valRegExp = pvs.valueRegExp();
- if(!Strings.isNullOrEmpty(valueRegExp)) {
-
- }
+ if(!Strings.isNullOrEmpty(valRegExp))
+ return
Pattern.compile(valRegExp).matcher(propVal).find();
String exactVal = pvs.value();
@@ -304,6 +304,11 @@ public class SingleBuildRunCtx implements ISuiteResults {
}
}
+ /**
+ * @param parameters Parameters from build.
+ * @param compactor Compactor.
+ * @param parmKey Parmeters key.
+ */
public String getPropertyOrSpecialValue(ParametersCompacted parameters,
IStringCompactor compactor,
String parmKey) {
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index 49c0d72..c89b122 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -28,7 +28,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF =
"https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20190529";
+ public static final String VERSION = "20190530";
/** Java version, where Web App is running. */
public String javaVer;