[JENKINS-49401] Move Setup Wizard initialization logic to the init re…

…actor. (#3282) This way, it is guaranteed Jenkins.save() has never been called before the SetupWizard is executed, and computation of the initial Setup Wizard state will be correct. Since the SetupWizard is now executed before reaching the COMPLETED milestone, a Jenkins.save() call has been added in order to persist any configuration change done in prior phases. (cherry picked from commit 9f59991)
jenkinsci · Apr 19, 2018 · f5a2401 · f5a2401
1 parent 8a2f986
commit f5a2401
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -918,9 +918,7 @@ protected Jenkins(File root, ServletContext context, PluginManager pluginManager
             if(KILL_AFTER_LOAD)
                 // TODO cleanUp?
                 System.exit(0);
-
-            setupWizard = new SetupWizard();
-            getInstallState().initializeState();
+            save();
 
             launchTcpSlaveAgentListener();
 
@@ -3146,6 +3144,9 @@ public void run(Reactor session) throws Exception {
                 // auto register root actions
                 for (Action a : getExtensionList(RootAction.class))
                     if (!actions.contains(a)) actions.add(a);
+
+                setupWizard = new SetupWizard();
+                getInstallState().initializeState();
             }
         });