Merge ~dannf/charms/+source/scalebot-jenkins:go-stop into ~ce-hyperscale/charms/+source/scalebot-jenkins:master

[dann frazier]

[Taihsiang Ho (tai271828)]

A cool feature we are looking forward to for a while :)

It's making sense to me to switch over to the "flag" API in the other merge proposal. This merge proposal is focusing on the introduction of "scalebot.go" and "scalebot.stop".

review: Approve

diff --git a/reactive/scalebot-jenkins.py b/reactive/scalebot-jenkins.py
index a08e463..9a8a2b6 100644
--- a/reactive/scalebot-jenkins.py
+++ b/reactive/scalebot-jenkins.py
@@ -22,6 +22,7 @@ from charms.reactive import (
     hook,
     when,
     when_all,
+    when_none,
     when_not,
     set_state,
     get_flags,
@@ -82,7 +83,7 @@ def scalebot_install_jjb_workaround():
     set_state("scalebot.jjb.workaround.installed")
 
 
-@when("extension.available")
+@when_all("scalebot.go", "extension.available")
 def configure_jenkins_jobbuilder(extension):
     remove_state("scalebot.configured.jobbuilder")
     status_set("maintenance", "Configuring JobBuilder")
@@ -179,7 +180,7 @@ def scalebot_git_config_check():
     return True
 
 
-@when("apt.installed.git")
+@when_all("scalebot.go", "apt.installed.git")
 def scalebot_git_clone():
     if not scalebot_git_config_check():
         return
@@ -244,7 +245,7 @@ def scalebot_git_clone():
     remove_state("scalebot.repo.init")
 
 
-@when_not("scalebot.repo.init")
+@when_not("scalebot.repo.init", "scalebot.stop")
 def scalebot_repo_init():
     init_path = os.path.join(SCALEBOT_REPO, "scalebot.d", "init")
     if os.path.exists(init_path):
@@ -269,6 +270,7 @@ def scalebot_git_reconfig():
     "scalebot.configured.repo",
     "scalebot.configured.jobbuilder",
     "scalebot.configured.juju",
+    "scalebot.go",
 )
 def scalebot_ready():
     status_set("active", "ScaleBot is Ready")
@@ -279,6 +281,7 @@ def scalebot_ready():
     "scalebot.configured.repo",
     "scalebot.configured.jobbuilder",
     "scalebot.configured.env",
+    "scalebot.go",
     "scalebot.jjb.workaround.installed",
     "scalebot.jenkins-http-ready",
 )
@@ -306,7 +309,7 @@ def scalebot_juju_reconfig():
         scalebot_configure_juju()
 
 
-@when_all("apt.installed.juju")
+@when_all("apt.installed.juju", "scalebot.go")
 def scalebot_configure_juju():
     config = hookenv.config()
 
@@ -444,8 +447,22 @@ def scalebot_configure_juju_for_lab(clouds, creds, modeldefaults, bootstrapconst
         set_state("scalebot.configured.juju")
 
 
+@when_not("scalebot.stop")
+def scalebot_start():
+    set_state("scalebot.go")
+
+
 @hook("stop")
+def scalebot_stop():
+    set_state("scalebot.stop")
+    remove_state("scalebot.go")
+    log("Stopping Scalebot.")
+    status_set("maintenance", "Stopping ScaleBot")
+
+
+@when("scalebot.stop")
 def scalebot_juju_destroy_controller():
+    status_set("maintenance", "Destroying Juju controller")
     subprocess.run(
         [
             "/bin/su",
@@ -492,13 +509,14 @@ println(lst.size());
 """
 
 
-@when_not("scalebot.configured.env")
+@when_none("scalebot.configured.env", "scalebot.stop")
 @when_all(
+    "scalebot.go",
     "scalebot.jenkins-http-ready",
     "scalebot.jjb.workaround.installed",
     "scalebot.written.env",
 )
-@when("extension.available")
+@when_all("extension.available", "scalebot.go")
 def safe_jenkins_service_restart(extension):
     """Restart Jenkins service if no jobs are running.