prep jenkins jobs for our 1.25 release (#997)

* update enum description and default golang version * bump validate jobs to 1.25 * update vault-spec to setup vault per docs (s/percona/mysql) * apparently create_refs needs a qualified refs prefix: https://docs.github.com/en/rest/git/refs#create-a-reference * add validation job with kube-ovn as the cni * workaround test_ceph for lp:1929537 * ceph-fs needs more fire
charmed-kubernetes · Aug 29, 2022 · f8c284f · f8c284f
1 parent c3ecb86
commit f8c284f
Show file tree

Hide file tree

Showing 18 changed files with 156 additions and 55 deletions.
diff --git a/cilib/enums.py b/cilib/enums.py
@@ -13,10 +13,10 @@
 # Next MAJOR.MINOR
 # This controls whether or not we publish pre-release snaps in our channels.
 # Typically, this is K8S_STABLE_VERSION +1. However, when prepping the next
-# stable release, this will be +2. For example, 1.23 is currently stable and
-# we're working on the 1.24 GA. Set this value to '1.25' sometime between the
-# final RC and GA so we don't get pre-release builds (e.g. 1.24.1-alpha.0) in
-# our 1.24 tracks.
+# stable release, this will be +2. For example, 1.24 is currently stable and
+# we're working on the 1.25 GA. Set this value to '1.26' sometime between the
+# final RC and GA so we don't get pre-release builds (e.g. 1.25.1-alpha.0) in
+# our 1.25 tracks.
 K8S_NEXT_VERSION = "1.26"
 
 # Lowest K8S SEMVER to process, this is usually stable - 3

diff --git a/cilib/github_api.py b/cilib/github_api.py
@@ -144,7 +144,7 @@ def create_ref(self, sha, tag=None, branch=None):
         """Create git reference."""
         one_and_only_one = any((tag, branch)) and not all((tag, branch))
         assert one_and_only_one, "Either tag or branch should be defined"
-        ref = f"tags/{tag}" if tag else f"heads/{branch}"
+        ref = f"refs/tags/{tag}" if tag else f"refs/heads/{branch}"
         resp = self.session.post(
             self._GITREFS_API.format(**self._render),
             headers={"Accept": "application/vnd.github+json"},

diff --git a/cilib/service/snap.py b/cilib/service/snap.py
@@ -65,7 +65,7 @@ def sync_from_upstream(self):
                     "patches": [],
                     "go_version": enums.K8S_GO_MAP.get(
                         f"{k8s_major_minor.major}.{k8s_major_minor.minor}",
-                        "go/1.17/stable",
+                        "go/1.19/stable",
                     ),
                 }
 

diff --git a/jobs/integration/validation.py b/jobs/integration/validation.py
@@ -2430,11 +2430,13 @@ async def test_ceph(model, tools):
     await validate_storage_class(model, "cephfs", "Ceph")
     # cleanup
     log("removing ceph applications")
+    # LP:1929537 get ceph-fs outta there with fire.
+    # NB: can't use destroy() here because it doesn't support --force.
     tasks = {
+        model.applications["ceph-fs"].units[0].machine.destroy(force=True),
         model.applications["ceph-mon"].destroy(),
         model.applications["ceph-osd"].destroy(),
     }
-    tasks.add(model.applications["ceph-fs"].destroy())
     (done1, _) = await asyncio.wait(tasks)
     for task in done1:
         # read and ignore any exception so that it doesn't get raised

diff --git a/jobs/validate-offline/spec.yml b/jobs/validate-offline/spec.yml
@@ -1,7 +1,7 @@
 plan:
   - &BASE_JOB
     env:
-      - SNAP_VERSION=1.24/edge
+      - SNAP_VERSION=1.25/edge
       - JUJU_DEPLOY_BUNDLE=charmed-kubernetes
       - JUJU_DEPLOY_CHANNEL=edge
       - JUJU_CLOUD=aws/us-east-1

diff --git a/jobs/validate.yaml b/jobs/validate.yaml
@@ -28,6 +28,7 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
             - 1.23/edge
             - 1.22/edge
@@ -146,6 +147,7 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
             - 1.23/edge
             - 1.22/edge
@@ -323,16 +325,16 @@
           values:
             - runner-validate
       - axis:
-           type: user-defined
-           name: snap_version
-           values:
-             - 1.24/edge
-             - 1.23/edge
+          type: user-defined
+          name: snap_version
+          values:
+            - 1.25/edge
+            - 1.24/edge
       - axis:
-           type: user-defined
-           name: series
-           values:
-             - focal
+          type: user-defined
+          name: series
+          values:
+            - focal
     builders:
       - set-env:
           JOB_SPEC_DIR: "jobs/validate"
@@ -364,16 +366,16 @@
           values:
             - runner-validate
       - axis:
-           type: user-defined
-           name: snap_version
-           values:
-             - 1.24/edge
-             - 1.23/edge
+          type: user-defined
+          name: snap_version
+          values:
+            - 1.25/edge
+            - 1.24/edge
       - axis:
-           type: user-defined
-           name: series
-           values:
-             - focal
+          type: user-defined
+          name: series
+          values:
+            - focal
     builders:
       - set-env:
           JOB_SPEC_DIR: "jobs/validate"
@@ -410,8 +412,8 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
-            - 1.23/edge
       - axis:
           type: user-defined
           name: series
@@ -460,8 +462,8 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
-            - 1.23/edge
       - axis:
           type: user-defined
           name: series
@@ -501,8 +503,8 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
-            - 1.23/edge
       - axis:
           type: user-defined
           name: series
@@ -542,8 +544,8 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
-            - 1.23/edge
       - axis:
           type: user-defined
           name: series
@@ -583,8 +585,8 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
-            - 1.23/edge
       - axis:
           type: user-defined
           name: series
@@ -624,8 +626,8 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
-            - 1.23/edge
       - axis:
           type: user-defined
           name: series
@@ -638,6 +640,37 @@
           COMMAND: |
             bash jobs/validate/multus-spec $snap_version $series
 
+- job:
+    name: 'validate-ck-ovn'
+    node: runner-validate
+    description: |
+      Validates CK edge with the kube-ovn edge charm for the latest release.
+    project-type: freestyle
+    scm:
+      - k8s-jenkins-jenkaas
+    wrappers:
+      - default-job-wrapper
+      - ci-creds
+    properties:
+      - block-on-infra
+      - build-discarder:
+          num-to-keep: 3
+    parameters:
+      - string:
+           name: SNAP_VERSION
+           default: 1.25/edge
+      - string:
+           name: SERIES
+           default: jammy
+    triggers:
+        - timed: "@weekly"
+    builders:
+      - set-env:
+          JOB_SPEC_DIR: "jobs/validate"
+      - run-venv:
+          COMMAND: |
+            bash jobs/validate/ovn-spec
+
 - job:
     name: 'validate-ck-sriov'
     node: runner-validate
@@ -665,8 +698,8 @@
           type: user-defined
           name: snap_version
           values:
+            - 1.25/edge
             - 1.24/edge
-            - 1.23/edge
       - axis:
           type: user-defined
           name: series

diff --git a/jobs/validate/aws-iam-spec b/jobs/validate/aws-iam-spec
@@ -35,7 +35,7 @@ function test::execute
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/calico-spec b/jobs/validate/calico-spec
@@ -101,7 +101,7 @@ function juju::deploy
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/ck-s390-spec b/jobs/validate/ck-s390-spec
@@ -111,7 +111,7 @@ function ci::cleanup::before
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/localhost-spec b/jobs/validate/localhost-spec
@@ -103,7 +103,7 @@ function ci::cleanup::before
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/multus-spec b/jobs/validate/multus-spec
@@ -79,7 +79,7 @@ function ci::cleanup::before
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/nvidia-spec b/jobs/validate/nvidia-spec
@@ -37,7 +37,7 @@ EOF
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/ovn-spec b/jobs/validate/ovn-spec
@@ -0,0 +1,58 @@
+#!/bin/bash
+# shellcheck disable=SC2034,SC1090
+
+set -x
+
+###############################################################################
+# INITIALIZE
+###############################################################################
+: "${WORKSPACE:=$(pwd)}"
+
+. "$WORKSPACE/ci.bash"
+. "$WORKSPACE/juju.bash"
+
+###############################################################################
+# FUNCTION OVERRIDES
+###############################################################################
+function juju::deploy::overlay
+{
+    cat <<EOF > overlay.yaml
+series: $SERIES
+applications:
+  kubernetes-control-plane:
+    channel: $JUJU_DEPLOY_CHANNEL
+    options:
+      channel: $SNAP_VERSION
+      allow-privileged: "true"
+  kubernetes-worker:
+    channel: $JUJU_DEPLOY_CHANNEL
+    options:
+      channel: $SNAP_VERSION
+  calico: null
+  kube-ovn:
+    charm: kube-ovn
+    channel: $JUJU_DEPLOY_CHANNEL
+relations:
+  - [kube-ovn:cni, kubernetes-control-plane:cni]
+  - [kube-ovn:cni, kubernetes-worker:cni]
+EOF
+}
+
+###############################################################################
+# ENV
+###############################################################################
+SNAP_VERSION=${SNAP_VERSION}
+SERIES=${SERIES}
+JUJU_DEPLOY_BUNDLE=charmed-kubernetes
+JUJU_DEPLOY_CHANNEL=edge
+JUJU_CLOUD=vsphere/Boston
+JUJU_CONTROLLER=validate-$(identifier::short)
+JUJU_MODEL=validate-ovn
+ARCH=amd64
+JOB_NAME_CUSTOM="validate-ck-ovn-$SERIES-$SNAP_VERSION"
+JOB_ID=$(identifier)
+
+###############################################################################
+# START
+###############################################################################
+ci::run
diff --git a/jobs/validate/spec b/jobs/validate/spec
@@ -36,7 +36,7 @@ EOF
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/sriov-spec b/jobs/validate/sriov-spec
@@ -87,7 +87,7 @@ function ci::cleanup::before
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/tigera-ee-spec b/jobs/validate/tigera-ee-spec
@@ -49,7 +49,7 @@ function juju::deploy
 ###############################################################################
 # ENV
 ###############################################################################
-SNAP_VERSION=${1:-1.24/edge}
+SNAP_VERSION=${1:-1.25/edge}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=kubernetes-tigera-secure-ee
 JUJU_DEPLOY_CHANNEL=${3:-edge}

diff --git a/jobs/validate/upgrade-spec b/jobs/validate/upgrade-spec
@@ -39,7 +39,7 @@ function test::execute
 export CHARM_CHANNEL_UPGRADE_TO=latest/edge
 export SNAP_CHANNEL_UPGRADE_TO=latest/edge
 
-SNAP_VERSION=${1:-1.23/stable}
+SNAP_VERSION=${1:-1.24/stable}
 SERIES=${2:-focal}
 JUJU_DEPLOY_BUNDLE=charmed-kubernetes
 JUJU_DEPLOY_CHANNEL=${3:-stable}