The Unified and Autonomous Development Platform
Remove image criteria from job executor match condition
Robin Shen2bf9c606cf04
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 41bd71a6be..541fa606b9 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -130,8 +130,6 @@ public class Build extends AbstractEntity implements Referenceable {public static final String PROP_JOB = "jobName";- public static final String NAME_IMAGE = "Image";-public static final String NAME_STATUS = "Status";public static final String PROP_STATUS = "status";@@ -200,7 +198,7 @@ public class Build extends AbstractEntity implements Referenceable {NAME_PROJECT, NAME_NUMBER, NAME_JOB, NAME_STATUS, NAME_SUBMITTER, NAME_CANCELLER,NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE,NAME_PULL_REQUEST, NAME_BRANCH, NAME_TAG, NAME_COMMIT, NAME_VERSION, NAME_DEPENDENCIES,- NAME_DEPENDENTS, NAME_ERROR_MESSAGE, NAME_LOG, NAME_IMAGE, BuildMetric.NAME_REPORT);+ NAME_DEPENDENTS, NAME_ERROR_MESSAGE, NAME_LOG, BuildMetric.NAME_REPORT);public static final List<String> QUERY_FIELDS = Lists.newArrayList(NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION, NAME_PULL_REQUEST,diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.javaindex 5a364254b3..57c0f538ff 100644--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java@@ -124,9 +124,7 @@ public class JobMatch extends Criteria<Build> {}public static void checkField(String fieldName, int operator) {- if (fieldName.equals(Build.NAME_PROJECT)- || fieldName.equals(Build.NAME_JOB)- || fieldName.equals(Build.NAME_IMAGE)) {+ if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_JOB)) {if (operator != JobMatchLexer.Is)throw newOperatorException(fieldName, operator);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.javaindex 4fb6170b43..526d051545 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java@@ -41,10 +41,7 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {if ("criteriaField".equals(spec.getLabel())) {- List<String> fields = Lists.newArrayList(- Build.NAME_PROJECT,- Build.NAME_JOB,- Build.NAME_IMAGE);+ List<String> fields = Lists.newArrayList(Build.NAME_PROJECT, Build.NAME_JOB);return SuggestionUtils.suggest(fields, matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);