Skip to content

[TEST] Plugin reader ignore dependents test #14617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nineinchnick wants to merge 3 commits into from
Closed

[TEST] Plugin reader ignore dependents test #14617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
512e0a9
Allow plugin reader to ignore dependents of plugins
Jun 15, 2022
095d285
Don't exclude server modules when checking impacted modules
Oct 13, 2022
460b56f
Use JDK 17 based image for Server IT
Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ jobs:
- name: Maven validate
run: |
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
$RETRY $MAVEN validate ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -Dgib.logImpactedTo=gib-impacted.log -P disable-check-spi-dependencies -pl '!:trino-docs,!:trino-server,!:trino-server-rpm'
$RETRY $MAVEN validate ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -Dgib.logImpactedTo=gib-impacted.log -P disable-check-spi-dependencies -pl '!:trino-docs'
- name: Set matrix
id: set-matrix
run: |
Expand Down Expand Up @@ -658,10 +658,10 @@ jobs:
- name: Map impacted plugins to features
run: |
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"
$MAVEN validate ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -Dgib.logImpactedTo=gib-impacted.log -pl '!:trino-docs,!:trino-server-rpm'
$MAVEN validate ${MAVEN_FAST_INSTALL} ${MAVEN_GIB} -Dgib.logImpactedTo=gib-impacted.log -pl '!:trino-docs'
# GIB doesn't run on master, so make sure the file always exist
touch gib-impacted.log
testing/trino-plugin-reader/target/trino-plugin-reader-*-executable.jar -i gib-impacted.log -p core/trino-server/target/trino-server-*-hardlinks/plugin > impacted-features.log
testing/trino-plugin-reader/target/trino-plugin-reader-*-executable.jar -i gib-impacted.log -p core/trino-server/target/trino-server-*-hardlinks/plugin -a core/trino-server,core/trino-server-rpm > impacted-features.log
echo "Impacted plugin features:"
cat impacted-features.log
- name: Product tests artifact
Expand Down
2 changes: 1 addition & 1 deletion core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
@Test(singleThreaded = true)
public class ServerIT
{
private static final String BASE_IMAGE = "ghcr.io/trinodb/testing/centos7-oj11";
private static final String BASE_IMAGE = "ghcr.io/trinodb/testing/centos7-oj17";

@Parameters("rpm")
@Test
Expand Down
7 changes: 6 additions & 1 deletion testing/trino-plugin-reader/src/main/java/io/trino/server/PluginReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ public class PluginReader
@Option(names = {"-r", "--root-pom"}, description = "Trino root module pom.xml")
private File rootPom = new File("pom.xml");

@Option(names = {"-a", "--allowed-non-plugins"}, description = "Allowed non-plugin modules, before ignoring whole impacted modules list; usually dependents of plugins")
private List<String> allowedNonPlugins = List.of();

public static void main(String... args)
{
int exitCode = new CommandLine(new PluginReader()).execute(args);
Expand All @@ -107,7 +110,9 @@ public Integer call()
.collect(toMap(plugin -> plugin.getClass().getName(), identity()));
Stream<Map.Entry<String, String>> modulesStream = requireNonNull(modulesToPlugins).entrySet().stream();
if (impactedModules.isPresent()) {
List<String> nonPluginModules = impactedModules.get().stream().filter(module -> !modulesToPlugins.containsKey(module)).collect(Collectors.toList());
List<String> nonPluginModules = impactedModules.get().stream()
.filter(module -> !modulesToPlugins.containsKey(module) && !allowedNonPlugins.contains(module))
.collect(Collectors.toList());
if (nonPluginModules.size() != 0) {
log.warn("Impacted modules list includes non-plugin modules, ignoring it: %s", nonPluginModules);
}
Expand Down