opendev/gerrit
Code Issues Proposed changes

Init: Optionally skip plugin installation process

Browse Source 
That change fixes acceptance test execution from eclipse.

Change-Id: I489578d06a670547ea42dbbe41e2057b490208cd
This commit is contained in:
David Ostrovsky
2013-09-14 22:14:56 +02:00
parent 0309b790b4
commit d0ac97501b
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/GerritServer.java
View File

@@ -84,7 +84,8 @@ class GerritServer {
File tmp = TempFileUtil.createTempDirectory(); File tmp = TempFileUtil.createTempDirectory();
Init init = new Init(); Init init = new Init();
int rc = init.main(new String[] { int rc = init.main(new String[] {
"-d", tmp.getPath(), "--batch", "--no-auto-start"}); "-d", tmp.getPath(), "--batch", "--no-auto-start",
"--skip-plugins"});
if (rc != 0) { if (rc != 0) {
throw new RuntimeException("Couldn't initialize site"); throw new RuntimeException("Couldn't initialize site");
} }

28
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
View File

@@ -70,6 +70,9 @@ public class Init extends SiteProgram {
@Option(name = "--no-auto-start", usage = "Don't automatically start daemon after init") @Option(name = "--no-auto-start", usage = "Don't automatically start daemon after init")
private boolean noAutoStart; private boolean noAutoStart;
@Option(name = "--skip-plugins", usage = "Don't install plugin")
private boolean skipPlugins = false;
@Option(name = "--list-plugins", usage = "List available plugins") @Option(name = "--list-plugins", usage = "List available plugins")
private boolean listPlugins; private boolean listPlugins;
@@ -90,22 +93,25 @@ public class Init extends SiteProgram {
ErrorLogFile.errorOnlyConsole(); ErrorLogFile.errorOnlyConsole();
final SiteInit init = createSiteInit(); final SiteInit init = createSiteInit();
final List<PluginData> plugins = InitPlugins.listPlugins(init.site); if (!skipPlugins) {
ConsoleUI ui = ConsoleUI.getInstance(false); final List<PluginData> plugins = InitPlugins.listPlugins(init.site);
verifyInstallPluginList(ui, plugins); ConsoleUI ui = ConsoleUI.getInstance(false);
if (listPlugins) { verifyInstallPluginList(ui, plugins);
if (!plugins.isEmpty()) { if (listPlugins) {
ui.message("Available plugins:\n"); if (!plugins.isEmpty()) {
for (PluginData plugin : plugins) { ui.message("Available plugins:\n");
ui.message(" * %s version %s\n", plugin.name, plugin.version); for (PluginData plugin : plugins) {
ui.message(" * %s version %s\n", plugin.name, plugin.version);
}
} else {
ui.message("No plugins found.\n");
} }
} else { return 0;
ui.message("No plugins found.\n");
} }
return 0;
} }
init.flags.autoStart = !noAutoStart && init.site.isNew; init.flags.autoStart = !noAutoStart && init.site.isNew;
init.flags.skipPlugins = skipPlugins;
final SiteRun run; final SiteRun run;
try { try {

4
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitFlags.java
View File

@@ -34,10 +34,14 @@ public class InitFlags {
/** Run the daemon (and open the web UI in a browser) after initialization. */ /** Run the daemon (and open the web UI in a browser) after initialization. */
public boolean autoStart; public boolean autoStart;
/** Skip plugins */
public boolean skipPlugins;
public final FileBasedConfig cfg; public final FileBasedConfig cfg;
public final FileBasedConfig sec; public final FileBasedConfig sec;
public final List<String> installPlugins; public final List<String> installPlugins;
@Inject @Inject
InitFlags(final SitePaths site, InitFlags(final SitePaths site,
final @InstallPlugins List<String> installPlugins) throws IOException, final @InstallPlugins List<String> installPlugins) throws IOException,

4
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
View File

@@ -75,6 +75,10 @@ public class SitePathInitializer {
mkdir(site.data_dir); mkdir(site.data_dir);
for (InitStep step : steps) { for (InitStep step : steps) {
if (step instanceof InitPlugins
&& flags.skipPlugins) {
continue;
}
step.run(); step.run();
} }