IGNITE-10095: Filtering parameters can be used for tagging builds.
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 d51bec5..5433d4b 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
@@ -276,9 +276,7 @@
if (Strings.isNullOrEmpty(propVal))
continue;
- List<ParameterValueSpec> selection = parm.selection();
- Stream<ParameterValueSpec> stream = selection.stream();
- stream
+ parm.selection().stream()
.filter(v -> Objects.equals(v.value(), propVal))
.findAny()
.ifPresent(v -> addTag(v.label()));
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BuildParameterSpec.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BuildParameterSpec.java
index c63ef81..ec3e85a 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BuildParameterSpec.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/BuildParameterSpec.java
@@ -38,7 +38,7 @@
* For triggering parameters: possble random values.
* For filtering parameters: used as value for selection and displaying result.
*/
- @Nullable private List<ParameterValueSpec> selectionValues = new ArrayList<>();
+ @Nullable private List<ParameterValueSpec> selection = new ArrayList<>();
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
@@ -50,12 +50,12 @@
return Objects.equals(name, param.name) &&
Objects.equals(value, param.value) &&
Objects.equals(randomValue, param.randomValue) &&
- Objects.equals(selectionValues, param.selectionValues);
+ Objects.equals(selection, param.selection);
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return Objects.hash(name, value, randomValue, selectionValues);
+ return Objects.hash(name, value, randomValue, selection);
}
/**
@@ -72,12 +72,12 @@
if (!randomValue)
return value;
- if (selectionValues.isEmpty())
+ if (selection.isEmpty())
return value;
- int idx = (int)(Math.random() * selectionValues.size());
+ int idx = (int)(Math.random() * selection.size());
- ParameterValueSpec spec = selectionValues.get(idx);
+ ParameterValueSpec spec = selection.get(idx);
return spec.value();
}
@@ -87,8 +87,8 @@
}
public List<ParameterValueSpec> selection() {
- return (selectionValues == null || selectionValues.isEmpty())
+ return (selection == null || selection.isEmpty())
? Collections.emptyList()
- : Collections.unmodifiableList(selectionValues);
+ : Collections.unmodifiableList(selection);
}
}
diff --git a/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css b/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css
index 434175b..de84f61 100644
--- a/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css
+++ b/ignite-tc-helper-web/src/main/webapp/css/style-1.5.css
@@ -589,6 +589,7 @@
}
.buildTag {
+ border: 1px solid #cfcfcf;
-webkit-box-shadow: 2px 4px 1px 0px rgba(224,224,224,1);
-moz-box-shadow: 2px 4px 1px 0px rgba(224,224,224,1);
box-shadow: 2px 4px 1px 0px rgba(224,224,224,1);
diff --git a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
index ae80ec1..04ace45 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js
@@ -649,19 +649,19 @@
"[ " + "<a href='" + suite.webToBuild + "' title=''> " +
"tests " + suite.failedTests + " " + suite.result;
- if(isDefinedAndFilled(suite.tags)) {
- for (let i = 0; i < suite.tags.length; i++) {
- const tag = suite.tags[i];
- res += " <div style='buildTag'>" + tag + "</div>" ;
- }
- }
-
if (isDefinedAndFilled(suite.warnOnly) && suite.warnOnly.length > 0) {
res += " warn " + suite.warnOnly.length;
}
res += "</a> ]";
+ if(isDefinedAndFilled(suite.tags)) {
+ for (let i = 0; i < suite.tags.length; i++) {
+ const tag = suite.tags[i];
+ res += " <span class='buildTag'>" + tag + "</span>" ;
+ }
+ }
+
if (isDefinedAndFilled(suite.runningBuildCount) && suite.runningBuildCount !== 0) {
res += " <img src='https://image.flaticon.com/icons/png/128/2/2745.png' width=12px height=12px> ";
res += " " + suite.runningBuildCount + " running";
