Merge ~alejdg/jenkins-agent-charm:master into jenkins-agent-charm:master

[Alexandre Gomes]

Rename charm to jenkins-agent

f720aae... by Alexandre Gomes on 2021-12-03

Fix tests after renaming

Unmerged commits

f720aae... by Alexandre Gomes on 2021-12-03

Fix tests after renaming

871848a... by Alexandre Gomes on 2021-11-26

Rename charm to jenkins-agent

diff --git a/README.md b/README.md
index 7541fec..c37458e 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,28 @@
 # Overview
 
-This charm provisions a Jenkins slave to connect to a Jenkins master.
+This charm provisions a Jenkins agent to connect to a Jenkins instance.
 This is the companion to the Jenkins charm.
 
 
 # Usage
 
-To deploy a Jenkins slave you will also need to deploy the jenkins master
+To deploy a Jenkins agent you will also need to deploy the jenkins
 charm. This can be done as follows:
 
     juju deploy jenkins
-    juju deploy -n 5 jenkins-slave
-    juju add-relation jenkins jenkins-slave
+    juju deploy -n 5 jenkins-agent
+    juju add-relation jenkins jenkins-agent
 
 There are cases where you want to provision a specific machine that
 provides specific resources for tests, such as CPU architecture or
-network access. You can deploy the extra slave like this:
+network access. You can deploy the extra agent like this:
 
     juju add-machine <special-machine-private-ip>
-    juju deploy --to <special-mabine-number> jenkins-slave ppc-slave
+    juju deploy --to <special-mabine-number> jenkins-agent ppc-agent
 
 See the Jenkins charm for more details.
 
 
 # Notes
 
-We can't use interface:jenkins-slave yet as it's not fully implemented.
+We can't use interface:jenkins-agent yet as it's not fully implemented.
diff --git a/config.yaml b/config.yaml
index 50380ce..6acd231 100644
--- a/config.yaml
+++ b/config.yaml
@@ -2,17 +2,17 @@ options:
   tools:
     type: string
     default: git gcc make bzr
-    description: Tooling to deploy on jenkins slave node
+    description: Tooling to deploy on jenkins agent node
   labels:
     type: string
-    description: Jenkins labels to associate with jenkins slave node
+    description: Jenkins labels to associate with jenkins agent node
     default: ""
-  master_url:
+  jenkins_url:
     type: string
     default: ""
     description: |
-      Configure the slave to use an explicit jenkins master instead of using
-      the jenkins-slave relation. This allows for the slave and master to
+      Configure the agent to use an explicit jenkins instead of using
+      the jenkins-agent relation. This allows for the agent and jenkins to
       be deployed in different environments.
   nagios_context:
     type: string
diff --git a/files/download-slave.sh b/files/download-agent.sh
similarity index 75%
rename from files/download-slave.sh
rename to files/download-agent.sh
index dfe1462..1ed1213 100755
--- a/files/download-slave.sh
+++ b/files/download-agent.sh
@@ -4,7 +4,7 @@
 # This file is managed by Juju.  Attempt no changes here.
 #
 
-SLAVE_JAR=/var/run/jenkins/slave.jar
+AGENT_JAR=/var/run/jenkins/agent.jar
 JENKINS_URL=$1
 JENKINS_HOSTNAME=$2
 JENKINS_JNLP=$3
@@ -15,19 +15,19 @@ then
     exit 1
 fi
 
-# Retrieve Slave JAR from Jenkins
-echo "Downloading slave.jar from ${JENKINS_URL}..."
-wget -q -O ${SLAVE_JAR}.new ${JENKINS_URL}/jnlpJars/slave.jar
+# Retrieve Agent JAR from Jenkins
+echo "Downloading agent.jar from ${JENKINS_URL}..."
+wget -q -O ${AGENT_JAR}.new ${JENKINS_URL}/jnlpJars/agent.jar
 
 # Retrive JNLP file from Jenkins
 echo "Downloading agent.jnlp from ${JENKINS_URL}..."
-wget -q ${JENKINS_URL}/computer/${JENKINS_HOSTNAME}/jenkins-agent.jnlp -O ${JENKINS_JNLP}.new  || wget -q ${JENKINS_URL}/computer/${JENKINS_HOSTNAME}/slave-agent.jnlp -O ${JENKINS_JNLP}.new
+wget -q ${JENKINS_URL}/computer/${JENKINS_HOSTNAME}/jenkins-agent.jnlp -O ${JENKINS_JNLP}.new  || wget -q ${JENKINS_URL}/computer/${JENKINS_HOSTNAME}/agent-agent.jnlp -O ${JENKINS_JNLP}.new
 sed -i -r "s|(<argument>-url</argument>.*</argument>)|\1<argument>-url</argument><argument>${JENKINS_URL}</argument>|g" ${JENKINS_JNLP}.new 
 
-# Check to make sure slave.jar and agent.jnlp were downloaded.
-if [ -s ${SLAVE_JAR}.new ] && [ -s ${JENKINS_JNLP}.new ]
+# Check to make sure agent.jar and agent.jnlp were downloaded.
+if [ -s ${AGENT_JAR}.new ] && [ -s ${JENKINS_JNLP}.new ]
 then
-    mv ${SLAVE_JAR}.new ${SLAVE_JAR}
+    mv ${AGENT_JAR}.new ${AGENT_JAR}
     mv ${JENKINS_JNLP}.new ${JENKINS_JNLP}
     exit 0
 else
diff --git a/files/jenkins-slave-logrotate-config b/files/jenkins-agent-logrotate-config
similarity index 91%
rename from files/jenkins-slave-logrotate-config
rename to files/jenkins-agent-logrotate-config
index 8ab641b..bb3dd44 100644
--- a/files/jenkins-slave-logrotate-config
+++ b/files/jenkins-agent-logrotate-config
@@ -2,7 +2,7 @@
 # This file is managed by Juju.  Attempt no changes here.
 #
 
-/var/log/jenkins/jenkins-slave.log {
+/var/log/jenkins/jenkins-agent.log {
     daily 
     copytruncate
     missingok
diff --git a/files/jenkins-slave-sudoers b/files/jenkins-agent-sudoers
similarity index 100%
rename from files/jenkins-slave-sudoers
rename to files/jenkins-agent-sudoers
diff --git a/files/jenkins-slave-systemd-config b/files/jenkins-agent-systemd-config
similarity index 66%
rename from files/jenkins-slave-systemd-config
rename to files/jenkins-agent-systemd-config
index 8148aaa..7e209d2 100644
--- a/files/jenkins-slave-systemd-config
+++ b/files/jenkins-agent-systemd-config
@@ -3,7 +3,7 @@
 #
 
 [Unit]
-Description=Jenkins CI Slave Agent
+Description=Jenkins CI Agent
 After=network.target
 
 [Service]
@@ -11,8 +11,8 @@ Type=simple
 # Always be Jenkinsing!
 Restart=always
 RestartSec=3
-ExecStartPre=/bin/bash -c '[ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave ; [ -n "$JENKINS_URL" ] || { exit 1; };  mkdir $JENKINS_RUN  > /dev/null 2>&1  || true ; chown -R $JENKINS_USER $JENKINS_RUN || true ; /usr/local/sbin/download-slave.sh $JENKINS_URL $JENKINS_HOSTNAME $JENKINS_JNLP; chown -R $JENKINS_USER $JENKINS_HOME || true'
-ExecStart=/bin/bash -c '[ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave ; exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins-slave -- $JAVA_ARGS -jar $JENKINS_RUN/slave.jar $JENKINS_ARGS'
+ExecStartPre=/bin/bash -c '[ -r /etc/default/jenkins-agent ] && . /etc/default/jenkins-agent ; [ -n "$JENKINS_URL" ] || { exit 1; };  mkdir $JENKINS_RUN  > /dev/null 2>&1  || true ; chown -R $JENKINS_USER $JENKINS_RUN || true ; /usr/local/sbin/download-agent.sh $JENKINS_URL $JENKINS_HOSTNAME $JENKINS_JNLP; chown -R $JENKINS_USER $JENKINS_HOME || true'
+ExecStart=/bin/bash -c '[ -r /etc/default/jenkins-agent ] && . /etc/default/jenkins-agent ; exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins-agent -- $JAVA_ARGS -jar $JENKINS_RUN/agent.jar $JENKINS_ARGS'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/files/jenkins-slave-upstart-config b/files/jenkins-agent-upstart-config
similarity index 73%
rename from files/jenkins-slave-upstart-config
rename to files/jenkins-agent-upstart-config
index cf8012d..8d62cbd 100644
--- a/files/jenkins-slave-upstart-config
+++ b/files/jenkins-agent-upstart-config
@@ -2,7 +2,7 @@
 # This file is managed by Juju.  Attempt no changes here.
 #
 
-description "Jenkins CI Slave Agent"
+description "Jenkins CI Agent"
 author "James Page <[e-mail]>"
 
 start on runlevel [2345]
@@ -13,18 +13,18 @@ respawn
 respawn limit unlimited
 
 pre-start script
-    [ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave
+    [ -r /etc/default/jenkins-agent ] && . /etc/default/jenkins-agent
     [ -n "$JENKINS_URL" ] || { stop; exit 0; }
     mkdir $JENKINS_RUN  > /dev/null 2>&1  || true
     chown -R $JENKINS_USER $JENKINS_RUN || true
-    /usr/local/sbin/download-slave.sh $JENKINS_URL $JENKINS_HOSTNAME $JENKINS_JNLP
+    /usr/local/sbin/download-agent.sh $JENKINS_URL $JENKINS_HOSTNAME $JENKINS_JNLP
     chown -R $JENKINS_USER $JENKINS_HOME || true
 end script
 
 script
-    [ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave
-    exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins-slave \
-        -- $JAVA_ARGS -jar $JENKINS_RUN/slave.jar $JENKINS_ARGS 
+    [ -r /etc/default/jenkins-agent ] && . /etc/default/jenkins-agent
+    exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins-agent \
+        -- $JAVA_ARGS -jar $JENKINS_RUN/agent.jar $JENKINS_ARGS 
 end script
 
 # Don't respawn too fast.
diff --git a/icon.svg b/icon.svg
index ad21970..9a7e0d0 100644
--- a/icon.svg
+++ b/icon.svg
@@ -515,7 +515,7 @@
          sodipodi:role="line"
          id="tspan3083"
          x="-236.76514"
-         y="715.29077">Slave</tspan></text>
+         y="715.29077">Agent</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/layer.yaml b/layer.yaml
index 52ccf61..8ca6473 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -3,4 +3,4 @@ includes:
   - layer:apt
   - layer:nagios
   - layer:status
-repo: lp:jenkins-slave-charm
+repo: lp:jenkins-agent-charm
diff --git a/metadata.yaml b/metadata.yaml
index 0f7eb5d..8f7c29d 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,14 +1,14 @@
-name: jenkins-slave
+name: jenkins-agent
 maintainer: Jenkins CI Charmers <[e-mail]>
-summary: Jenkins CI Slave
+summary: Jenkins CI Agent
 description: |
   Jenkins is a Continuous Integration server supporting
   flexible continuous integration and deployment methodologies
   and more.
   .
-  This charm provides support for jenkins slaves
+  This charm provides support for jenkins agents
   .
-  https://launchpad.net/jenkins-slave-charm
+  https://launchpad.net/jenkins-agent-charm
 tags:
   - applications
 series:
@@ -17,8 +17,8 @@ series:
   - xenial
   - trusty
 provides:
-  slave:
-    interface: jenkins-slave
-  nrpe-external-master:
-    interface: nrpe-external-master
+  agent:
+    interface: jenkins-agent
+  nrpe:
+    interface: nrpe
     scope: container
diff --git a/reactive/jenkins_agent.py b/reactive/jenkins_agent.py
new file mode 100644
index 0000000..8c9f426
--- /dev/null
+++ b/reactive/jenkins_agent.py
@@ -0,0 +1,248 @@
+import os
+
+from charmhelpers.core import hookenv, host, templating, unitdata
+from charmhelpers.contrib.charmsupport import nrpe
+from charmhelpers.fetch import apt_purge
+from charms import apt, reactive
+from charms.layer import status
+
+
[e-mail]('upgrade-charm')
+def upgrade_charm():
+    status.maintenance('forcing reconfiguration on upgrade-charm')
+    reactive.clear_flag('jenkins-agent.active')
+    reactive.clear_flag('jenkins-agent.installed')
+    reactive.clear_flag('nagios-nrpe.configured')
+
+
[e-mail]_not('jenkins-agent.installed')
+def install():
+    status.maintenance('installing jenkins-agent')
+    reactive.clear_flag('jenkins-agent.active')
+
+    config = hookenv.config()
+
+    status.maintenance('Adding jenkins-agent dependencies to be installed')
+    packages = ['wget', 'default-jre-headless']
+
+    # Install extra packages needed by the agent.
+    tools = config.get('tools')
+    if tools:
+        status.maintenance('Adding jenkins-agent additional tools to be installed: {}'.format(tools))
+        for package in tools.split():
+            packages.append(package)
+    apt.queue_install(packages)
+    if not apt.install_queued():
+        return  # apt layer already set blocked state.
+
+    # Get rid of the legacy jenkins-agent package, including config files.
+    status.maintenance('Removing the old jenkins-agent package... (obsoleted by this charm)')
+    apt_purge(['jenkins-agent'])
+
+    # Create jenkins user if it doesn't exist.
+    if host.user_exists('jenkins'):
+        status.maintenance('Installing jenkins-agent (user account already exists)...')
+    else:
+        status.maintenance('Installing jenkins-agent (user account)...')
+        host.adduser(username='jenkins', system_user=True, home_dir='/var/lib/jenkins')
+
+    # And ensure required directories exist and are set up.
+    status.maintenance('Installing jenkins-agent (directories)...')
+    agent_host = hookenv.local_unit().replace('/', '-')
+    for d in [
+        '/var/lib/jenkins',
+        '/var/lib/jenkins/agents',
+        '/var/lib/jenkins/agents/{}'.format(agent_host),
+        '/var/log/jenkins',
+    ]:
+        host.mkdir(d, owner='jenkins', group='jenkins', perms=0o755)
+
+    status.maintenance('Installing jenkins-agent (common files)...')
+    write_default_conf()
+    file_to_units('files/download-agent.sh', '/usr/local/sbin/download-agent.sh')
+    file_to_units('files/jenkins-agent-logrotate-config', '/etc/logrotate.d/jenkins-agent')
+
+    if host.lsb_release()['DISTRIB_CODENAME'] == 'trusty':
+        status.maintenance('Installing jenkins-agent (upstart job)...')
+        file_to_units('files/jenkins-agent-upstart-config', '/etc/init/jenkins-agent.conf')
+    else:
+        status.maintenance('Installing jenkins-agent (system unit)...')
+        file_to_units('files/jenkins-agent-systemd-config', '/lib/systemd/system/jenkins-agent.service')
+        host.service('enable', 'jenkins-agent')
+
+    status.maintenance('Installing jenkins-agent... done.')
+    reactive.clear_flag('jenkins-agent.configured')
+    reactive.set_flag('jenkins-agent.installed')
+
+
[e-mail]('config.changed')
+def config_changed():
+    status.maintenance('Configuration changed')
+    reactive.clear_flag('jenkins-agent.configured')
+    reactive.clear_flag('nagios-nrpe.configured')
+
+
[e-mail]('jenkins-agent.installed')
[e-mail]_not('jenkins-agent.configured')
+def configure_jenkins_agent():
+    status.maintenance('configuring jenkins-agent')
+    reactive.clear_flag('jenkins-agent.active')
+
+    config = hookenv.config()
+    kv = unitdata.kv()
+
+    if config.get('jenkins_url'):
+        status.maintenance("Using 'jenkins_url' to configure the agent.")
+        write_default_conf(config.get('jenkins_url'))
+    elif kv.get('url'):
+        status.maintenance("Using url from relation as 'jenkins_url'")
+        write_default_conf(kv.get('url'), secret=kv.get('secret'))
+    else:
+        status.maintenance("No 'jenkins_url' set; not configuring agent at this time.")
+        status.blocked("requires either agent relation or 'jenkins_url'")
+        reactive.clear_flag('jenkins-agent.active')
+        return
+
+    file_to_units('files/jenkins-agent-sudoers', '/etc/sudoers.d/jenkins', perms=0o440)
+
+    reactive.clear_flag('nagios-nrpe.configured')
+    reactive.set_flag('jenkins-agent.configured')
+
+
[e-mail]('jenkins-agent.configured')
[e-mail]('jenkins-agent.active')
[e-mail]('nrpe.available')
[e-mail]_not('nagios-nrpe.configured')
+def configure_nagios(nagios):
+    status.maintenance('setting up NRPE checks')
+    reactive.clear_flag('jenkins-agent.active')
+
+    # Use charmhelpers.contrib.charmsupport's nrpe to determine hostname
+    hostname = nrpe.get_nagios_hostname()
+    nrpe_setup = nrpe.NRPE(hostname=hostname, primary=True)
+
+    cmd = '/usr/lib/nagios/plugins/check_procs -c 1:1 -a agent.jar'
+    nrpe_setup.add_check('jenkins_agent_ps', 'Jenkins Agent Process', cmd)
+
+    nrpe_setup.write()
+    reactive.set_flag('nagios-nrpe.configured')
+    status.maintenance('NRPE configured')
+
+
[e-mail]('jenkins-agent.configured')
[e-mail]_not('jenkins-agent.active')
+def set_active():
+    config = hookenv.config()
+    kv = unitdata.kv()
+
+    # Startup the jenkins-agent service. This is called in the
+    # install, config-changed and upgrade-charm paths. It needs to be
+    # tolerant of a running or stopped jenkins-agent.
+    if host.service_running('jenkins-agent'):
+        status.maintenance('Restarting jenkins-agent...')
+        host.service_restart('jenkins-agent')
+    else:
+        status.maintenance('Starting jenkins-agent...')
+        host.service_start('jenkins-agent')
+
+    jenkins_url = config.get('jenkins_url')
+    if jenkins_url:
+        status.active('ready - using jenkins {} (jenkins_url)'.format(jenkins_url))
+    elif kv.get('url'):
+        status.active('ready - using jenkins from relation')
+    else:
+        status.blocked("set_active() but no jenkins")
+        return
+
+    reactive.set_flag('jenkins-agent.active')
+
+
+# We can't use interface:jenkins-agent yet as it's not implemented.
[e-mail]('agent-relation-joined', 'agent-relation-changed')
+def agent_relation_changed():
+    reactive.set_flag('agent-relation.available')
+    reactive.clear_flag('jenkins-agent.configured')
+    reactive.clear_flag('agent-relation.configured')
+
+
[e-mail]('agent-relation-departed', 'agent-relation-broken')
+def agent_relation_removed():
+    kv = unitdata.kv()
+    kv.set('url', None)
+    kv.set('secret', None)
+    reactive.clear_flag('agent-relation.available')
+
+
[e-mail]('agent-relation.available')
[e-mail]_not('agent-relation.configured')
+def agent_relation():
+    status.maintenance('setting up jenkins via agent relation')
+
+    config = hookenv.config()
+    kv = unitdata.kv()
+
+    if config.get('jenkins_url'):
+        hookenv.log("Config option 'jenkins_url' is set. Can't use agent relation.")
+        reactive.set_flag('agent-relation.configured')
+        return
+
+    url = hookenv.relation_get('url')
+    if url:
+        secret = hookenv.relation_get('secret')
+        kv.set('url', url)
+        kv.set('secret', secret)
+        write_default_conf(url, secret=secret)
+    else:
+        hookenv.log("Jenkins hasn't exported its url yet, exiting...")
+        return
+
+    reactive.clear_flag('jenkins-agent.active')
+
+    # Set the agent hostname to match the juju unit
+    # in the jenkins instance
+    agent_host = hookenv.local_unit().replace('/', '-')
+    agent_address = hookenv.unit_private_ip()
+    noexecutors = os.cpu_count()
+    config_labels = config.get('labels')
+
+    if config_labels:
+        labels = config_labels
+    else:
+        labels = os.uname()[4]
+
+    # Set all relations
+    hookenv.relation_set(executors=noexecutors)
+    hookenv.relation_set(labels=labels)
+    hookenv.relation_set(agenthost=agent_host)
+    hookenv.relation_set(agentaddress=agent_address)
+    reactive.set_flag('agent-relation.configured')
+
+
+def file_to_units(local_path, unit_path, perms=None, owner='root', group='root'):
+    """copy a file from the charm onto our unit(s)"""
+    file_perms = perms
+    if not perms:
+        # Let's try manually work it out
+        if local_path[-3:] == '.py' or local_path[-3:] == '.sh':
+            file_perms = 0o755
+        else:
+            file_perms = 0o644
+
+    with open(local_path, 'r') as fh:
+        host.write_file(path=unit_path, content=fh.read().encode(), owner=owner, group=group, perms=file_perms)
+
+
+def write_default_conf(
+    jenkins_url=None, owner='root', group='root', conf_path='/etc/default/jenkins-agent', secret=None
+):
+    templates_dir = os.path.join(hookenv.charm_dir(), 'templates')
+    agent_host = hookenv.local_unit().replace('/', '-')
+    templating.render(
+        'jenkins-agent-default',
+        conf_path,
+        {'jenkins_url': jenkins_url, 'agent_host': agent_host, 'secret': secret},
+        owner=owner,
+        group=group,
+        perms=0o444,
+        templates_dir=templates_dir,
+    )
diff --git a/reactive/jenkins_slave.py b/reactive/jenkins_slave.py
deleted file mode 100644
index dcb947d..0000000
--- a/reactive/jenkins_slave.py
+++ /dev/null
@@ -1,248 +0,0 @@
-import os
-
-from charmhelpers.core import hookenv, host, templating, unitdata
-from charmhelpers.contrib.charmsupport import nrpe
-from charmhelpers.fetch import apt_purge
-from charms import apt, reactive
-from charms.layer import status
-
-
[e-mail]('upgrade-charm')
-def upgrade_charm():
-    status.maintenance('forcing reconfiguration on upgrade-charm')
-    reactive.clear_flag('jenkins-slave.active')
-    reactive.clear_flag('jenkins-slave.installed')
-    reactive.clear_flag('nagios-nrpe.configured')
-
-
[e-mail]_not('jenkins-slave.installed')
-def install():
-    status.maintenance('installing jenkins-slave')
-    reactive.clear_flag('jenkins-slave.active')
-
-    config = hookenv.config()
-
-    status.maintenance('Adding jenkins-slave dependencies to be installed')
-    packages = ['wget', 'default-jre-headless']
-
-    # Install extra packages needed by the slave.
-    tools = config.get('tools')
-    if tools:
-        status.maintenance('Adding jenkins-slave additional tools to be installed: {}'.format(tools))
-        for package in tools.split():
-            packages.append(package)
-    apt.queue_install(packages)
-    if not apt.install_queued():
-        return  # apt layer already set blocked state.
-
-    # Get rid of the legacy jenkins-slave package, including config files.
-    status.maintenance('Removing the old jenkins-slave package... (obsoleted by this charm)')
-    apt_purge(['jenkins-slave'])
-
-    # Create jenkins user if it doesn't exist.
-    if host.user_exists('jenkins'):
-        status.maintenance('Installing jenkins-slave (user account already exists)...')
-    else:
-        status.maintenance('Installing jenkins-slave (user account)...')
-        host.adduser(username='jenkins', system_user=True, home_dir='/var/lib/jenkins')
-
-    # And ensure required directories exist and are set up.
-    status.maintenance('Installing jenkins-slave (directories)...')
-    slave_host = hookenv.local_unit().replace('/', '-')
-    for d in [
-        '/var/lib/jenkins',
-        '/var/lib/jenkins/slaves',
-        '/var/lib/jenkins/slaves/{}'.format(slave_host),
-        '/var/log/jenkins',
-    ]:
-        host.mkdir(d, owner='jenkins', group='jenkins', perms=0o755)
-
-    status.maintenance('Installing jenkins-slave (common files)...')
-    write_default_conf()
-    file_to_units('files/download-slave.sh', '/usr/local/sbin/download-slave.sh')
-    file_to_units('files/jenkins-slave-logrotate-config', '/etc/logrotate.d/jenkins-slave')
-
-    if host.lsb_release()['DISTRIB_CODENAME'] == 'trusty':
-        status.maintenance('Installing jenkins-slave (upstart job)...')
-        file_to_units('files/jenkins-slave-upstart-config', '/etc/init/jenkins-slave.conf')
-    else:
-        status.maintenance('Installing jenkins-slave (system unit)...')
-        file_to_units('files/jenkins-slave-systemd-config', '/lib/systemd/system/jenkins-slave.service')
-        host.service('enable', 'jenkins-slave')
-
-    status.maintenance('Installing jenkins-slave... done.')
-    reactive.clear_flag('jenkins-slave.configured')
-    reactive.set_flag('jenkins-slave.installed')
-
-
[e-mail]('config.changed')
-def config_changed():
-    status.maintenance('Configuration changed')
-    reactive.clear_flag('jenkins-slave.configured')
-    reactive.clear_flag('nagios-nrpe.configured')
-
-
[e-mail]('jenkins-slave.installed')
[e-mail]_not('jenkins-slave.configured')
-def configure_jenkins_slave():
-    status.maintenance('configuring jenkins-slave')
-    reactive.clear_flag('jenkins-slave.active')
-
-    config = hookenv.config()
-    kv = unitdata.kv()
-
-    if config.get('master_url'):
-        status.maintenance("Using 'master_url' to configure the slave.")
-        write_default_conf(config.get('master_url'))
-    elif kv.get('url'):
-        status.maintenance("Using url from relation as 'master_url'")
-        write_default_conf(kv.get('url'), secret=kv.get('secret'))
-    else:
-        status.maintenance("No 'master_url' set; not configuring slave at this time.")
-        status.blocked("requires either slave relation or 'master_url'")
-        reactive.clear_flag('jenkins-slave.active')
-        return
-
-    file_to_units('files/jenkins-slave-sudoers', '/etc/sudoers.d/jenkins', perms=0o440)
-
-    reactive.clear_flag('nagios-nrpe.configured')
-    reactive.set_flag('jenkins-slave.configured')
-
-
[e-mail]('jenkins-slave.configured')
[e-mail]('jenkins-slave.active')
[e-mail]('nrpe-external-master.available')
[e-mail]_not('nagios-nrpe.configured')
-def configure_nagios(nagios):
-    status.maintenance('setting up NRPE checks')
-    reactive.clear_flag('jenkins-slave.active')
-
-    # Use charmhelpers.contrib.charmsupport's nrpe to determine hostname
-    hostname = nrpe.get_nagios_hostname()
-    nrpe_setup = nrpe.NRPE(hostname=hostname, primary=True)
-
-    cmd = '/usr/lib/nagios/plugins/check_procs -c 1:1 -a slave.jar'
-    nrpe_setup.add_check('jenkins_slave_ps', 'Jenkins Slave Process', cmd)
-
-    nrpe_setup.write()
-    reactive.set_flag('nagios-nrpe.configured')
-    status.maintenance('NRPE configured')
-
-
[e-mail]('jenkins-slave.configured')
[e-mail]_not('jenkins-slave.active')
-def set_active():
-    config = hookenv.config()
-    kv = unitdata.kv()
-
-    # Startup the jenkins-slave service. This is called in the
-    # install, config-changed and upgrade-charm paths. It needs to be
-    # tolerant of a running or stopped jenkins-slave.
-    if host.service_running('jenkins-slave'):
-        status.maintenance('Restarting jenkins-slave...')
-        host.service_restart('jenkins-slave')
-    else:
-        status.maintenance('Starting jenkins-slave...')
-        host.service_start('jenkins-slave')
-
-    master_url = config.get('master_url')
-    if master_url:
-        status.active('ready - using jenkins {} (master_url)'.format(master_url))
-    elif kv.get('url'):
-        status.active('ready - using jenkins from relation')
-    else:
-        status.blocked("set_active() but no jenkins master")
-        return
-
-    reactive.set_flag('jenkins-slave.active')
-
-
-# We can't use interface:jenkins-slave yet as it's not implemented.
[e-mail]('slave-relation-joined', 'slave-relation-changed')
-def slave_relation_changed():
-    reactive.set_flag('slave-relation.available')
-    reactive.clear_flag('jenkins-slave.configured')
-    reactive.clear_flag('slave-relation.configured')
-
-
[e-mail]('slave-relation-departed', 'slave-relation-broken')
-def slave_relation_removed():
-    kv = unitdata.kv()
-    kv.set('url', None)
-    kv.set('secret', None)
-    reactive.clear_flag('slave-relation.available')
-
-
[e-mail]('slave-relation.available')
[e-mail]_not('slave-relation.configured')
-def slave_relation():
-    status.maintenance('setting up jenkins via slave relation')
-
-    config = hookenv.config()
-    kv = unitdata.kv()
-
-    if config.get('master_url'):
-        hookenv.log("Config option 'master_url' is set. Can't use slave relation.")
-        reactive.set_flag('slave-relation.configured')
-        return
-
-    url = hookenv.relation_get('url')
-    if url:
-        secret = hookenv.relation_get('secret')
-        kv.set('url', url)
-        kv.set('secret', secret)
-        write_default_conf(url, secret=secret)
-    else:
-        hookenv.log("Master hasn't exported its url yet, exiting...")
-        return
-
-    reactive.clear_flag('jenkins-slave.active')
-
-    # Set the slave hostname to match the juju unit
-    # in the jenkins master instance
-    slave_host = hookenv.local_unit().replace('/', '-')
-    slave_address = hookenv.unit_private_ip()
-    noexecutors = os.cpu_count()
-    config_labels = config.get('labels')
-
-    if config_labels:
-        labels = config_labels
-    else:
-        labels = os.uname()[4]
-
-    # Set all relations
-    hookenv.relation_set(executors=noexecutors)
-    hookenv.relation_set(labels=labels)
-    hookenv.relation_set(slavehost=slave_host)
-    hookenv.relation_set(slaveaddress=slave_address)
-    reactive.set_flag('slave-relation.configured')
-
-
-def file_to_units(local_path, unit_path, perms=None, owner='root', group='root'):
-    """copy a file from the charm onto our unit(s)"""
-    file_perms = perms
-    if not perms:
-        # Let's try manually work it out
-        if local_path[-3:] == '.py' or local_path[-3:] == '.sh':
-            file_perms = 0o755
-        else:
-            file_perms = 0o644
-
-    with open(local_path, 'r') as fh:
-        host.write_file(path=unit_path, content=fh.read().encode(), owner=owner, group=group, perms=file_perms)
-
-
-def write_default_conf(
-    master_url=None, owner='root', group='root', conf_path='/etc/default/jenkins-slave', secret=None
-):
-    templates_dir = os.path.join(hookenv.charm_dir(), 'templates')
-    slave_host = hookenv.local_unit().replace('/', '-')
-    templating.render(
-        'jenkins-slave-default',
-        conf_path,
-        {'master_url': master_url, 'slave_host': slave_host, 'secret': secret},
-        owner=owner,
-        group=group,
-        perms=0o444,
-        templates_dir=templates_dir,
-    )
diff --git a/templates/jenkins-slave-default b/templates/jenkins-agent-default
similarity index 77%
rename from templates/jenkins-slave-default
rename to templates/jenkins-agent-default
index b3b2148..93c0774 100644
--- a/templates/jenkins-slave-default
+++ b/templates/jenkins-agent-default
@@ -2,11 +2,11 @@
 # This file is managed by Juju.  Attempt no changes here.
 #
 
-# defaults for jenkins-slave component of the jenkins continuous integration 
+# defaults for jenkins-agent component of the jenkins continuous integration 
 # system
 
 # pulled in from the init script; makes things easier.
-NAME=jenkins-slave
+NAME=jenkins-agent
 
 # location of java
 JAVA=/usr/bin/java
@@ -31,25 +31,25 @@ JENKINS_HOME=/var/lib/jenkins
 JENKINS_RUN=/var/run/jenkins
 
 # URL of jenkins server to connect to 
-# Not specifying this parameter will stop the slave 
+# Not specifying this parameter will stop the agent 
 # job from running.
-{% if master_url %}
-JENKINS_URL="{{ master_url }}"
+{% if jenkins_url %}
+JENKINS_URL="{{ jenkins_url }}"
 {% else %}
 #JENKINS_URL=""
 {% endif %}
 
-# Name of slave configuration to use at JENKINS_URL
+# Name of agent configuration to use at JENKINS_URL
 # Override if it need to be something other than the
-# hostname of the server the slave is running on.
-{% if slave_host %}
-JENKINS_HOSTNAME="{{ slave_host }}"
+# hostname of the server the agent is running on.
+{% if agent_host %}
+JENKINS_HOSTNAME="{{ agent_host }}"
 {% else %}
 JENKINS_HOSTNAME="$(hostname)"
 {% endif %}
 
 # Log file location for use in Debian init script
-JENKINS_SLAVE_LOG=/var/log/jenkins/$NAME.log
+JENKINS_Agent_LOG=/var/log/jenkins/$NAME.log
 
 # OS LIMITS SETUP
 #   comment this out to observe /etc/security/limits.conf
@@ -63,11 +63,11 @@ MAXOPENFILES=8192
 # Jenkins jnlp file
 JENKINS_JNLP="${JENKINS_HOME}/agent.jnlp"
 
-# Arguments to pass to jenkins slave on startup
+# Arguments to pass to jenkins agent on startup
 {% if secret %}
-JENKINS_SLAVE_SECRET="{{ secret }}"
+JENKINS_Agent_SECRET="{{ secret }}"
 
-JENKINS_ARGS="-jnlpUrl file:${JENKINS_JNLP} -secret ${JENKINS_SLAVE_SECRET}"
+JENKINS_ARGS="-jnlpUrl file:${JENKINS_JNLP} -secret ${JENKINS_Agent_SECRET}"
 {% else %}
 JENKINS_ARGS="-jnlpUrl file:${JENKINS_JNLP}"
 {% endif %}
diff --git a/tests/functional/bundles/base-bionic.yaml b/tests/functional/bundles/base-bionic.yaml
index cb92d23..a4ac440 100644
--- a/tests/functional/bundles/base-bionic.yaml
+++ b/tests/functional/bundles/base-bionic.yaml
@@ -9,7 +9,7 @@ applications:
       password: admin
     expose: true
 
-  jenkins-slave:
+  jenkins-agent:
     num_units: 1
 
   nrpe:
@@ -17,6 +17,6 @@ applications:
 
 relations:
   - - jenkins
-    - jenkins-slave
-  - - jenkins-slave
+    - jenkins-agent
+  - - jenkins-agent
     - nrpe
diff --git a/tests/functional/bundles/base-focal.yaml b/tests/functional/bundles/base-focal.yaml
index 786b92a..54b8961 100644
--- a/tests/functional/bundles/base-focal.yaml
+++ b/tests/functional/bundles/base-focal.yaml
@@ -6,7 +6,7 @@ applications:
     num_units: 1
     expose: true
 
-  jenkins-slave:
+  jenkins-agent:
     num_units: 1
 
   nrpe:
@@ -14,6 +14,6 @@ applications:
 
 relations:
   - - jenkins
-    - jenkins-slave
-  - - jenkins-slave
+    - jenkins-agent
+  - - jenkins-agent
     - nrpe
diff --git a/tests/functional/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/functional/bundles/overlays/local-charm-overlay.yaml.j2
index 1adcb54..8486e62 100644
--- a/tests/functional/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/tests/functional/bundles/overlays/local-charm-overlay.yaml.j2
@@ -1,3 +1,3 @@
 applications:
-  jenkins-slave:
-    charm: /tmp/charm-builds/jenkins-slave
+  jenkins-agent:
+    charm: /tmp/charm-builds/jenkins-agent
diff --git a/tests/functional/tests.yaml b/tests/functional/tests.yaml
index 25f3335..a0413cb 100644
--- a/tests/functional/tests.yaml
+++ b/tests/functional/tests.yaml
@@ -1,4 +1,4 @@
-charm_name: jenkins-slave
+charm_name: jenkins-agent
 tests:
   - zaza.charm_tests.noop.tests.NoopTest
 configure:
@@ -15,5 +15,5 @@ smoke_bundles:
 target_deploy_status:
   jenkins:
     workload-status-message: Jenkins is running
-  jenkins-slave:
+  jenkins-agent:
     workload-status-message: ready - using jenkins from relation
diff --git a/tests/unit/files/jenkins-slave-default b/tests/unit/files/jenkins-agent-default
similarity index 79%
rename from tests/unit/files/jenkins-slave-default
rename to tests/unit/files/jenkins-agent-default
index c76f8e1..ca5d5ec 100644
--- a/tests/unit/files/jenkins-slave-default
+++ b/tests/unit/files/jenkins-agent-default
@@ -2,11 +2,11 @@
 # This file is managed by Juju.  Attempt no changes here.
 #
 
-# defaults for jenkins-slave component of the jenkins continuous integration 
+# defaults for jenkins-agent component of the jenkins continuous integration 
 # system
 
 # pulled in from the init script; makes things easier.
-NAME=jenkins-slave
+NAME=jenkins-agent
 
 # location of java
 JAVA=/usr/bin/java
@@ -30,21 +30,21 @@ JENKINS_HOME=/var/lib/jenkins
 JENKINS_RUN=/var/run/jenkins
 
 # URL of jenkins server to connect to 
-# Not specifying this parameter will stop the slave 
+# Not specifying this parameter will stop the agent 
 # job from running.
 
 #JENKINS_URL=""
 
 
-# Name of slave configuration to use at JENKINS_URL
+# Name of agent configuration to use at JENKINS_URL
 # Override if it need to be something other than the
-# hostname of the server the slave is running on.
+# hostname of the server the agent is running on.
 
-JENKINS_HOSTNAME="jenkins-slave-3"
+JENKINS_HOSTNAME="jenkins-agent-3"
 
 
 # Log file location for use in Debian init script
-JENKINS_SLAVE_LOG=/var/log/jenkins/$NAME.log
+JENKINS_Agent_LOG=/var/log/jenkins/$NAME.log
 
 # OS LIMITS SETUP
 #   comment this out to observe /etc/security/limits.conf
@@ -55,5 +55,5 @@ JENKINS_SLAVE_LOG=/var/log/jenkins/$NAME.log
 # to change the OS limits setup.
 MAXOPENFILES=8192
 
-# Arguments to pass to jenkins slave on startup
-JENKINS_ARGS="-jnlpUrl $JENKINS_URL/computer/$JENKINS_HOSTNAME/slave-agent.jnlp"
\ No newline at end of file
+# Arguments to pass to jenkins agent on startup
+JENKINS_ARGS="-jnlpUrl $JENKINS_URL/computer/$JENKINS_HOSTNAME/agent-agent.jnlp"
\ No newline at end of file
diff --git a/tests/unit/test_jenkins_slave.py b/tests/unit/test_jenkins_agent.py
similarity index 64%
rename from tests/unit/test_jenkins_slave.py
rename to tests/unit/test_jenkins_agent.py
index 1300c73..18f6965 100644
--- a/tests/unit/test_jenkins_slave.py
+++ b/tests/unit/test_jenkins_agent.py
@@ -19,10 +19,10 @@ from charms.layer import status  # NOQA: E402
 
 # Add path to where our reactive layer lives and import.
 sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))))
-from reactive import jenkins_slave  # NOQA: E402
+from reactive import jenkins_agent  # NOQA: E402
 
 
-INITIAL_CONF = 'tests/unit/files/jenkins-slave-default'
+INITIAL_CONF = 'tests/unit/files/jenkins-agent-default'
 
 
 class TestSetDefaultConf(unittest.TestCase):
@@ -56,7 +56,7 @@ class TestSetDefaultConf(unittest.TestCase):
         patcher = mock.patch('charmhelpers.core.hookenv.local_unit')
         self.mock_local_unit = patcher.start()
         self.addCleanup(patcher.stop)
-        self.mock_local_unit.return_value = 'mock-jenkins-slave/0'
+        self.mock_local_unit.return_value = 'mock-jenkins-agent/0'
 
         patcher = mock.patch('charmhelpers.core.hookenv.unit_private_ip')
         self.mock_local_unit = patcher.start()
@@ -73,7 +73,7 @@ class TestSetDefaultConf(unittest.TestCase):
         self.addCleanup(patcher.stop)
         self.mock_log.return_value = (
             'Linux',
-            'mock-jenkins-slave',
+            'mock-jenkins-agent',
             '4.15.0-46-generic',
             '#49-Ubuntu SMP Wed Feb 6 09:33:07 UTC 2019',
             'x86_64',
@@ -92,11 +92,11 @@ class TestSetDefaultConf(unittest.TestCase):
     @mock.patch('charms.reactive.clear_flag')
     def test_hook_upgrade_charm_flags(self, clear_flag):
         '''Test correct flags set via upgrade-charm hook'''
-        jenkins_slave.upgrade_charm()
+        jenkins_agent.upgrade_charm()
         self.assertFalse(status.maintenance.assert_called())
         expected = [
-            mock.call('jenkins-slave.active'),
-            mock.call('jenkins-slave.installed'),
+            mock.call('jenkins-agent.active'),
+            mock.call('jenkins-agent.installed'),
             mock.call('nagios-nrpe.configured'),
         ]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
@@ -104,9 +104,9 @@ class TestSetDefaultConf(unittest.TestCase):
     @mock.patch('charms.reactive.clear_flag')
     def test_hook_config_changed(self, clear_flag):
         '''Test correct flags are set via config-changed charm hook'''
-        jenkins_slave.config_changed()
+        jenkins_agent.config_changed()
         self.assertFalse(status.maintenance.assert_called())
-        expected = [mock.call('jenkins-slave.configured'), mock.call('nagios-nrpe.configured')]
+        expected = [mock.call('jenkins-agent.configured'), mock.call('nagios-nrpe.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
 
     @mock.patch('charmhelpers.core.hookenv.config')
@@ -114,33 +114,33 @@ class TestSetDefaultConf(unittest.TestCase):
     @mock.patch('charmhelpers.core.host.mkdir')
     @mock.patch('charmhelpers.core.host.service')
     @mock.patch('charmhelpers.core.host.user_exists')
-    @mock.patch('reactive.jenkins_slave.apt_purge')
-    @mock.patch('reactive.jenkins_slave.file_to_units')
-    @mock.patch('reactive.jenkins_slave.write_default_conf')
+    @mock.patch('reactive.jenkins_agent.apt_purge')
+    @mock.patch('reactive.jenkins_agent.file_to_units')
+    @mock.patch('reactive.jenkins_agent.write_default_conf')
     def test_hook_install(
         self, write_default_conf, file_to_units, apt_purge, user_exists, service, mkdir, adduser, config
     ):
         config.return_value = {'tools': 'some-tools-package'}
         apt.install_queued.return_value = True
         user_exists.return_value = False
-        jenkins_slave.install()
+        jenkins_agent.install()
         self.assertFalse(status.maintenance.assert_called())
 
         expected = [mock.call(home_dir='/var/lib/jenkins', system_user=True, username='jenkins')]
         self.assertFalse(adduser.assert_has_calls(expected, any_order=True))
         expected = [
             mock.call('/var/lib/jenkins', group='jenkins', owner='jenkins', perms=0o755),
-            mock.call('/var/lib/jenkins/slaves', group='jenkins', owner='jenkins', perms=0o755),
-            mock.call('/var/lib/jenkins/slaves/mock-jenkins-slave-0', group='jenkins', owner='jenkins', perms=0o755),
+            mock.call('/var/lib/jenkins/agents', group='jenkins', owner='jenkins', perms=0o755),
+            mock.call('/var/lib/jenkins/agents/mock-jenkins-agent-0', group='jenkins', owner='jenkins', perms=0o755),
             mock.call('/var/log/jenkins', group='jenkins', owner='jenkins', perms=0o755),
         ]
         self.assertFalse(mkdir.assert_has_calls(expected, any_order=True))
-        self.assertFalse(service.assert_has_calls([mock.call('enable', 'jenkins-slave')], any_order=True))
-        self.assertFalse(apt_purge.assert_has_calls([mock.call(['jenkins-slave'])], any_order=True))
+        self.assertFalse(service.assert_has_calls([mock.call('enable', 'jenkins-agent')], any_order=True))
+        self.assertFalse(apt_purge.assert_has_calls([mock.call(['jenkins-agent'])], any_order=True))
         expected = [
-            mock.call('files/download-slave.sh', '/usr/local/sbin/download-slave.sh'),
-            mock.call('files/jenkins-slave-logrotate-config', '/etc/logrotate.d/jenkins-slave'),
-            mock.call('files/jenkins-slave-systemd-config', '/lib/systemd/system/jenkins-slave.service'),
+            mock.call('files/download-agent.sh', '/usr/local/sbin/download-agent.sh'),
+            mock.call('files/jenkins-agent-logrotate-config', '/etc/logrotate.d/jenkins-agent'),
+            mock.call('files/jenkins-agent-systemd-config', '/lib/systemd/system/jenkins-agent.service'),
         ]
         self.assertFalse(file_to_units.assert_has_calls(expected, any_order=True))
         self.assertFalse(write_default_conf.assert_called())
@@ -152,96 +152,96 @@ class TestSetDefaultConf(unittest.TestCase):
 
         apt.install_queued.return_value = False
         apt_purge.reset_mock()
-        jenkins_slave.install()
+        jenkins_agent.install()
         self.assertFalse(apt_purge.assert_not_called())
 
         apt.install_queued.return_value = True
         user_exists.return_value = True
         adduser.reset_mock()
-        jenkins_slave.install()
+        jenkins_agent.install()
         self.assertFalse(adduser.assert_not_called())
 
     @mock.patch('charmhelpers.core.host.lsb_release')
     @mock.patch('charmhelpers.core.host.adduser')
     @mock.patch('charmhelpers.core.host.mkdir')
-    @mock.patch('reactive.jenkins_slave.file_to_units')
-    @mock.patch('reactive.jenkins_slave.write_default_conf')
+    @mock.patch('reactive.jenkins_agent.file_to_units')
+    @mock.patch('reactive.jenkins_agent.write_default_conf')
     def test_hook_install_trusty(self, write_default_conf, file_to_units, mkdir, adduser, lsb_release):
         apt.install_queued.return_value = True
         lsb_release.return_value = {'DISTRIB_CODENAME': 'trusty'}
-        jenkins_slave.install()
+        jenkins_agent.install()
         self.assertFalse(status.maintenance.assert_called())
 
-        # file_to_units('files/jenkins-slave-upstart-config', '/etc/init/jenkins-slave.conf')
-        expected = [mock.call('files/jenkins-slave-upstart-config', '/etc/init/jenkins-slave.conf')]
+        # file_to_units('files/jenkins-agent-upstart-config', '/etc/init/jenkins-agent.conf')
+        expected = [mock.call('files/jenkins-agent-upstart-config', '/etc/init/jenkins-agent.conf')]
         self.assertFalse(file_to_units.assert_has_calls(expected, any_order=True))
 
     @mock.patch('charms.reactive.clear_flag')
     @mock.patch('charms.reactive.set_flag')
     @mock.patch('charmhelpers.core.hookenv.config')
     @mock.patch('charmhelpers.core.unitdata.kv')
-    @mock.patch('reactive.jenkins_slave.write_default_conf')
-    @mock.patch('reactive.jenkins_slave.file_to_units')
-    def test_configure_jenkins_slave_no_url(
+    @mock.patch('reactive.jenkins_agent.write_default_conf')
+    @mock.patch('reactive.jenkins_agent.file_to_units')
+    def test_configure_jenkins_agent_no_url(
         self, file_to_units, write_default_conf, unitdata_kv, config, set_flag, clear_flag
     ):
         config.return_value = {}
         unitdata_kv.return_value = {}
-        jenkins_slave.configure_jenkins_slave()
+        jenkins_agent.configure_jenkins_agent()
         self.assertFalse(write_default_conf.assert_not_called())
         self.assertFalse(status.blocked.assert_called())
-        self.assertFalse(clear_flag.assert_has_calls([mock.call('jenkins-slave.active')], any_order=True))
+        self.assertFalse(clear_flag.assert_has_calls([mock.call('jenkins-agent.active')], any_order=True))
 
     @mock.patch('charms.reactive.clear_flag')
     @mock.patch('charms.reactive.set_flag')
     @mock.patch('charmhelpers.core.hookenv.config')
     @mock.patch('charmhelpers.core.unitdata.kv')
-    @mock.patch('reactive.jenkins_slave.write_default_conf')
-    @mock.patch('reactive.jenkins_slave.file_to_units')
-    def test_configure_jenkins_slave_master_url(
+    @mock.patch('reactive.jenkins_agent.write_default_conf')
+    @mock.patch('reactive.jenkins_agent.file_to_units')
+    def test_configure_jenkins_agent_jenkins_url(
         self, file_to_units, write_default_conf, unitdata_kv, config, set_flag, clear_flag
     ):
-        config.return_value = {'master_url': 'http://10.1.1.1:8080'}
+        config.return_value = {'jenkins_url': 'http://10.1.1.1:8080'}
         unitdata_kv.return_value = {}
-        jenkins_slave.configure_jenkins_slave()
+        jenkins_agent.configure_jenkins_agent()
         self.assertFalse(write_default_conf.assert_called_once_with('http://10.1.1.1:8080'))
-        self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-slave.configured')], any_order=True))
-        expected = [mock.call('jenkins-slave.active'), mock.call('nagios-nrpe.configured')]
+        self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-agent.configured')], any_order=True))
+        expected = [mock.call('jenkins-agent.active'), mock.call('nagios-nrpe.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
 
     @mock.patch('charms.reactive.clear_flag')
     @mock.patch('charms.reactive.set_flag')
     @mock.patch('charmhelpers.core.hookenv.config')
     @mock.patch('charmhelpers.core.unitdata.kv')
-    @mock.patch('reactive.jenkins_slave.write_default_conf')
-    @mock.patch('reactive.jenkins_slave.file_to_units')
-    def test_configure_jenkins_slave_relation_url(
+    @mock.patch('reactive.jenkins_agent.write_default_conf')
+    @mock.patch('reactive.jenkins_agent.file_to_units')
+    def test_configure_jenkins_agent_relation_url(
         self, file_to_units, write_default_conf, unitdata_kv, config, set_flag, clear_flag
     ):
         config.return_value = {}
         unitdata_kv.return_value = {'url': 'http://10.22.22.22:8080'}
-        jenkins_slave.configure_jenkins_slave()
+        jenkins_agent.configure_jenkins_agent()
         self.assertTrue(write_default_conf.called_once_with('http://10.22.22.22:8080'))
         self.assertEqual(write_default_conf.call_args_list, [mock.call('http://10.22.22.22:8080', secret=None)])
-        self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-slave.configured')], any_order=True))
-        expected = [mock.call('jenkins-slave.active'), mock.call('nagios-nrpe.configured')]
+        self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-agent.configured')], any_order=True))
+        expected = [mock.call('jenkins-agent.active'), mock.call('nagios-nrpe.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
 
     @mock.patch('charms.reactive.clear_flag')
     @mock.patch('charms.reactive.set_flag')
     @mock.patch('charmhelpers.core.hookenv.config')
     @mock.patch('charmhelpers.core.unitdata.kv')
-    @mock.patch('reactive.jenkins_slave.write_default_conf')
-    @mock.patch('reactive.jenkins_slave.file_to_units')
-    def test_configure_jenkins_slave_relation_url_with_secret(
+    @mock.patch('reactive.jenkins_agent.write_default_conf')
+    @mock.patch('reactive.jenkins_agent.file_to_units')
+    def test_configure_jenkins_agent_relation_url_with_secret(
         self, file_to_units, write_default_conf, unitdata_kv, config, set_flag, clear_flag
     ):
         config.return_value = {}
         unitdata_kv.return_value = {'url': 'http://10.22.22.22:8080', 'secret': 'sekrit'}
-        jenkins_slave.configure_jenkins_slave()
+        jenkins_agent.configure_jenkins_agent()
         self.assertEqual(write_default_conf.call_args_list, [mock.call('http://10.22.22.22:8080', secret='sekrit')])
-        self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-slave.configured')], any_order=True))
-        expected = [mock.call('jenkins-slave.active'), mock.call('nagios-nrpe.configured')]
+        self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-agent.configured')], any_order=True))
+        expected = [mock.call('jenkins-agent.active'), mock.call('nagios-nrpe.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
 
     @mock.patch('charmhelpers.core.host.service_running')
@@ -250,10 +250,10 @@ class TestSetDefaultConf(unittest.TestCase):
     def test_set_active_running(self, service_start, service_restart, service_running):
         '''Test service restarted when already running'''
         service_running.return_value = True
-        jenkins_slave.set_active()
+        jenkins_agent.set_active()
         self.assertFalse(status.maintenance.assert_called())
         self.assertFalse(service_start.assert_not_called())
-        self.assertFalse(service_restart.assert_called_once_with('jenkins-slave'))
+        self.assertFalse(service_restart.assert_called_once_with('jenkins-agent'))
 
     @mock.patch('charmhelpers.core.host.service_running')
     @mock.patch('charmhelpers.core.host.service_restart')
@@ -261,9 +261,9 @@ class TestSetDefaultConf(unittest.TestCase):
     def test_set_active_not_running(self, service_start, service_restart, service_running):
         '''Test service restarted when not running'''
         service_running.return_value = False
-        jenkins_slave.set_active()
+        jenkins_agent.set_active()
         self.assertFalse(status.maintenance.assert_called())
-        self.assertFalse(service_start.assert_called_once_with('jenkins-slave'))
+        self.assertFalse(service_start.assert_called_once_with('jenkins-agent'))
         self.assertFalse(service_restart.assert_not_called())
 
     @mock.patch('charms.reactive.set_flag')
@@ -271,29 +271,29 @@ class TestSetDefaultConf(unittest.TestCase):
     @mock.patch('charmhelpers.core.unitdata.kv')
     @mock.patch('charmhelpers.core.host.service_running')
     @mock.patch('charmhelpers.core.host.service_start')
-    def test_set_active_master_url_or_relation(self, service_start, service_running, unitdata_kv, config, set_flag):
+    def test_set_active_jenkins_url_or_relation(self, service_start, service_running, unitdata_kv, config, set_flag):
         service_running.return_value = False
-        config.return_value = {'master_url': 'http://ext-jenkins-be.internal:8080'}
-        jenkins_slave.set_active()
-        status.active.assert_called_once_with('ready - using jenkins http://ext-jenkins-be.internal:8080 (master_url)')
+        config.return_value = {'jenkins_url': 'http://ext-jenkins-be.internal:8080'}
+        jenkins_agent.set_active()
+        status.active.assert_called_once_with('ready - using jenkins http://ext-jenkins-be.internal:8080 (jenkins_url)')
 
         config.return_value = {}
         status.active.reset_mock()
-        jenkins_slave.set_active()
+        jenkins_agent.set_active()
         status.active.assert_called_once_with('ready - using jenkins from relation')
 
     @mock.patch('charms.reactive.clear_flag')
     @mock.patch('charms.reactive.set_flag')
-    def test_hook_slave_relation_changed_flags(self, set_flag, clear_flag):
-        jenkins_slave.slave_relation_changed()
-        expected = [mock.call('jenkins-slave.configured'), mock.call('slave-relation.configured')]
+    def test_hook_agent_relation_changed_flags(self, set_flag, clear_flag):
+        jenkins_agent.agent_relation_changed()
+        expected = [mock.call('jenkins-agent.configured'), mock.call('agent-relation.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
-        self.assertFalse(set_flag.assert_has_calls([mock.call('slave-relation.available')], any_order=True))
+        self.assertFalse(set_flag.assert_has_calls([mock.call('agent-relation.available')], any_order=True))
 
     @mock.patch('charms.reactive.clear_flag')
-    def test_hook_slave_relation_removed_flags(self, clear_flag):
-        jenkins_slave.slave_relation_removed()
-        self.assertFalse(clear_flag.assert_has_calls([mock.call('slave-relation.available')], any_order=True))
+    def test_hook_agent_relation_removed_flags(self, clear_flag):
+        jenkins_agent.agent_relation_removed()
+        self.assertFalse(clear_flag.assert_has_calls([mock.call('agent-relation.available')], any_order=True))
 
     @mock.patch('charms.reactive.clear_flag')
     @mock.patch('charms.reactive.set_flag')
@@ -301,55 +301,55 @@ class TestSetDefaultConf(unittest.TestCase):
     @mock.patch('charmhelpers.core.hookenv.relation_get')
     @mock.patch('charmhelpers.core.hookenv.relation_set')
     @mock.patch('charmhelpers.core.unitdata.kv')
-    @mock.patch('reactive.jenkins_slave.write_default_conf')
-    def test_hook_slave_relation(
+    @mock.patch('reactive.jenkins_agent.write_default_conf')
+    def test_hook_agent_relation(
         self, write_default_conf, unitdata_kv, relation_set, relation_get, config, set_flag, clear_flag
     ):
-        config.return_value = {'master_url': ''}
+        config.return_value = {'jenkins_url': ''}
         relation_get.return_value = 'http://10.1.1.1:8080'
-        jenkins_slave.slave_relation()
+        jenkins_agent.agent_relation()
         expected = [mock.call('url'), mock.call('secret')]
         self.assertFalse(relation_get.assert_has_calls(expected))
-        self.assertFalse(clear_flag.assert_called_once_with('jenkins-slave.active'))
-        self.assertFalse(set_flag.assert_called_once_with('slave-relation.configured'))
+        self.assertFalse(clear_flag.assert_called_once_with('jenkins-agent.active'))
+        self.assertFalse(set_flag.assert_called_once_with('agent-relation.configured'))
         expected = [
             mock.call(executors=3),
             mock.call(labels='x86_64'),
-            mock.call(slavehost='mock-jenkins-slave-0'),
-            mock.call(slaveaddress='10.1.2.3'),
+            mock.call(agenthost='mock-jenkins-agent-0'),
+            mock.call(agentaddress='10.1.2.3'),
         ]
         self.assertFalse(relation_set.assert_has_calls(expected, any_order=True))
 
-        config.return_value = {'master_url': '', 'labels': 'label1 label2'}
+        config.return_value = {'jenkins_url': '', 'labels': 'label1 label2'}
         relation_get.return_value = 'http://10.1.1.1:8080'
         relation_set.reset_mock()
-        jenkins_slave.slave_relation()
+        jenkins_agent.agent_relation()
         expected = [
             mock.call(executors=3),
             mock.call(labels='label1 label2'),
-            mock.call(slavehost='mock-jenkins-slave-0'),
-            mock.call(slaveaddress='10.1.2.3'),
+            mock.call(agenthost='mock-jenkins-agent-0'),
+            mock.call(agentaddress='10.1.2.3'),
         ]
         self.assertFalse(relation_set.assert_has_calls(expected, any_order=True))
 
     @mock.patch('charmhelpers.core.hookenv.config')
     @mock.patch('charmhelpers.core.hookenv.relation_get')
     @mock.patch('charms.reactive.set_flag')
-    def test_hook_slave_relation_master_url_set(self, set_flag, relation_get, config):
-        config.return_value = {'master_url': 'http://10.1.1.1:8080'}
+    def test_hook_agent_relation_jenkins_url_set(self, set_flag, relation_get, config):
+        config.return_value = {'jenkins_url': 'http://10.1.1.1:8080'}
         relation_get.return_value = ''
-        jenkins_slave.slave_relation()
+        jenkins_agent.agent_relation()
         self.assertFalse(relation_get.assert_not_called())
-        self.assertFalse(set_flag.assert_called_once_with('slave-relation.configured'))
+        self.assertFalse(set_flag.assert_called_once_with('agent-relation.configured'))
 
     @mock.patch('charms.reactive.clear_flag')
     @mock.patch('charms.reactive.set_flag')
     @mock.patch('charmhelpers.core.hookenv.config')
     @mock.patch('charmhelpers.core.hookenv.relation_get')
-    def test_hook_slave_relation_relation_url_not_set(self, relation_get, config, set_flag, clear_flag):
-        config.return_value = {'master_url': ''}
+    def test_hook_agent_relation_relation_url_not_set(self, relation_get, config, set_flag, clear_flag):
+        config.return_value = {'jenkins_url': ''}
         relation_get.return_value = ''
-        jenkins_slave.slave_relation()
+        jenkins_agent.agent_relation()
         self.assertFalse(clear_flag.assert_not_called())
 
     @mock.patch('charms.reactive.set_flag')
@@ -358,11 +358,11 @@ class TestSetDefaultConf(unittest.TestCase):
     def test_configure_nagios(self, nrpe, get_nagios_hostname, set_flag):
         get_nagios_hostname.return_value = 'some-host.local'
         nrpe_instance_mock = nrpe(get_nagios_hostname(), primary=True)
-        jenkins_slave.configure_nagios(None)
+        jenkins_agent.configure_nagios(None)
         status.maintenance.assert_called()
         want = [
             mock.call(
-                'jenkins_slave_ps', 'Jenkins Slave Process', '/usr/lib/nagios/plugins/check_procs -c 1:1 -a slave.jar'
+                'jenkins_agent_ps', 'Jenkins Agent Process', '/usr/lib/nagios/plugins/check_procs -c 1:1 -a agent.jar'
             )
         ]
         nrpe_instance_mock.add_check.assert_has_calls(want, any_order=True)
@@ -373,17 +373,17 @@ class TestSetDefaultConf(unittest.TestCase):
         set_flag.assert_has_calls(want, any_order=True)
 
     def test_write_default_conf_update(self):
-        jenkins_slave.write_default_conf('http://10.1.1.1:8080', self.user, self.group, self.conf_file)
+        jenkins_agent.write_default_conf('http://10.1.1.1:8080', self.user, self.group, self.conf_file)
         self.assertTrue(conf_match(self.conf_file, 'JENKINS_URL', 'http://10.1.1.1:8080'))
 
     def test_write_default_conf_reset(self):
-        jenkins_slave.write_default_conf(None, self.user, self.group, self.conf_file)
+        jenkins_agent.write_default_conf(None, self.user, self.group, self.conf_file)
         self.assertTrue(conf_match(self.conf_file, '#JENKINS_URL', ''))
 
     def test_file_to_units_executable_sh(self):
-        source = os.path.join(self.charm_dir, 'files/download-slave.sh')
+        source = os.path.join(self.charm_dir, 'files/download-agent.sh')
         dest = os.path.join(self.tmpdir, os.path.basename(source))
-        jenkins_slave.file_to_units(source, dest, owner=self.user, group=self.group)
+        jenkins_agent.file_to_units(source, dest, owner=self.user, group=self.group)
         with open(dest, 'rb') as fh:
             want = fh.read().decode('utf-8')
         self.assertTrue(conf_equals(source, want))
@@ -394,7 +394,7 @@ class TestSetDefaultConf(unittest.TestCase):
     def test_file_to_units_executable_py(self):
         source = os.path.join(self.charm_dir, 'tests/unit/files/somefile.py')
         dest = os.path.join(self.tmpdir, os.path.basename(source))
-        jenkins_slave.file_to_units(source, dest, owner=self.user, group=self.group)
+        jenkins_agent.file_to_units(source, dest, owner=self.user, group=self.group)
         with open(dest, 'rb') as fh:
             want = fh.read().decode('utf-8')
         self.assertTrue(conf_equals(source, want))
@@ -403,9 +403,9 @@ class TestSetDefaultConf(unittest.TestCase):
         self.assertTrue(os.access(dest, os.X_OK))
 
     def test_file_to_units_non_executable(self):
-        source = os.path.join(self.charm_dir, 'files/jenkins-slave-logrotate-config')
+        source = os.path.join(self.charm_dir, 'files/jenkins-agent-logrotate-config')
         dest = os.path.join(self.tmpdir, os.path.basename(source))
-        jenkins_slave.file_to_units(source, dest, owner=self.user, group=self.group)
+        jenkins_agent.file_to_units(source, dest, owner=self.user, group=self.group)
         with open(dest, 'rb') as fh:
             want = fh.read().decode('utf-8')
         self.assertTrue(conf_equals(dest, want))
@@ -416,7 +416,7 @@ class TestSetDefaultConf(unittest.TestCase):
     def test_file_to_units_non_executable_x_on_disk(self):
         source = os.path.join(self.charm_dir, 'tests/unit/files/somefile')
         dest = os.path.join(self.tmpdir, os.path.basename(source))
-        jenkins_slave.file_to_units(source, dest, owner=self.user, group=self.group)
+        jenkins_agent.file_to_units(source, dest, owner=self.user, group=self.group)
         with open(dest, 'rb') as fh:
             want = fh.read().decode('utf-8')
         self.assertTrue(conf_equals(source, want))
@@ -427,7 +427,7 @@ class TestSetDefaultConf(unittest.TestCase):
     def test_file_to_units_with_perms(self):
         source = os.path.join(self.charm_dir, 'tests/unit/files/somefile')
         dest = os.path.join(self.tmpdir, os.path.basename(source))
-        jenkins_slave.file_to_units(source, dest, owner=self.user, group=self.group, perms=0o640)
+        jenkins_agent.file_to_units(source, dest, owner=self.user, group=self.group, perms=0o640)
         with open(dest, 'rb') as fh:
             want = fh.read().decode('utf-8')
         self.assertTrue(conf_equals(source, want))