~dannf/charms/+source/scalebot-jenkins:juju-snap-hack

Branch merges

Propose for merging

Merged into ~ce-hyperscale/charms/+source/scalebot-jenkins:main at revision 98cae059369b0cd95da43b50e7b5a43b6d89835c

Taihsiang Ho: Approve on 2022-03-25

Diff: 57 lines (+23/-8)

3 files modified

config.yaml (+0/-6)
layer.yaml (+0/-1)
reactive/scalebot-jenkins.py (+23/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

98cae05... by dann frazier on 2022-03-23

Install juju from the snap, but execute it without the snap wrapper

Cut & pasting of the included comment:

    New versions of juju are only distributed as a snap, but the jenkins
    charm doesn't support running juju from a snap:
      https://github.com/jenkinsci/jenkins-charm/issues/59
    Let's install juju via the snap, but purely as a way to get the juju
    binary onto the system. Instead of executing it through the snap wrapper
    (/snap/bin/juju), we install a symlink to the juju binary itself
    (/snap/juju/current/bin/juju) into /usr/local/bin. /usr/local/bin
    precedes the /snap/bin wrapper in $PATH. This method allows us to run
    it without any of the snap confinement.

LP: #1965450

cae6fd2... by dann frazier on 2022-03-18

Remove the crumb workaround insertion for initscript-based jenkins installs

With this we can no longer support Jenkins debs prior to 2.335 where
they migrated to systemd. Doing so lets us get rid of an ugly hack
that will otherwise likely bit-rot.

6509d49... by dann frazier on 2022-03-17

Add support for the Crumb workaround when using systemd

We don't need to preserve and append to an existing $JAVA_ARGS here because
the jenkins package now correctly uses $JAVA_OPTS for JVM settings.

c7437ca... by dann frazier on 2022-03-17

Add support for setting Jenkins environment variables with systemd

Jenkins switched from using an initscript to a systemd unit in 2.335.

We need to keep the /etc/profile.d support as well for scripts that
run outside of jenkins, e.g. `pull-and-reload-jobs`.

LP: #1965340

6e1054f... by dann frazier on 2022-03-23

black automatic reformatting

5a27b2f... by Patricia Domingues on 2022-03-17

charmcraft: update readme.devel

changing info how we can now release our charm to charmhub.io via charmcraft

dd09dcf... by Patricia Domingues on 2022-03-14

charmcraft change name to be able to upload the charm

8edb251... by Patricia Domingues on 2022-03-11

charmhub migration: add charmcraft.yaml

with this file we will be able to complete the charm
migration from the charmstore to charmhub and upload/release
it as required.
This will keep the reactive-based charm type.

a9c050e... by Patricia Domingues on 2022-03-07

remove python-jenkins pinning old version

we're pinning version `0.4.15` due to an error in the past, but
now this is not required anymore.
Available versins:
(from versions: 0.2, 0.2.1, 0.3.1, 0.3.3, 0.3.4, 0.4.0, 0.4.1, 0.4.2, 0.4.3,
0.4.4, 0.4.5, 0.4.6, 0.4.7, 0.4.8, 0.4.9, 0.4.10, 0.4.11, 0.4.12, 0.4.13,
0.4.14, 0.4.15, 0.4.16, 1.0.0, 1.0.1, 1.0.2, 1.1.0, 1.2.0, 1.2.1, 1.3.0,
 1.4.0, 1.5.0, 1.6.0, 1.7.0, 1.8.0.0a0).

latest version will be installed:
$ pip3 show python-jenkins
Name: python-jenkins
Version: 1.7.0

2cdc310... by Patricia Domingues on 2022-03-04

add bootstrap-series option

adding
` --bootstrap-series (= "")` with this we'll be able
to specify the series of the bootstrap machine on our bundle.

currently, if we deploy a new lab, jenkins controller will still have
bionic.
I think the reason bionic is still default is because we're using
juju ppa for installing it on scalebot/jenkins instance and so the Juju
version is 2.7.6., but then either way, we can update it from:
2.7.6 -> 2.8.13 -> 2.9.25 (latest available now).
Adding this will allow to deploy it with focal.