Simplify the EKS job so you don't have type in the version informatio…

…n 5 times (#1559)
charmed-kubernetes · Aug 20, 2024 · de292b3 · de292b3
1 parent d5b6ff1
commit de292b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/jobs/build-snaps.yaml b/jobs/build-snaps.yaml
@@ -83,7 +83,7 @@
             Source tag from https://github.com/kubernetes/kubernetes.
       - string:
           name: channels
-          default: '{version}/edge,{version}/beta,{version}/candidate'
+          default: 'edge,beta,candidate,stable'
           description: |
             Comma separated snap store channels to release the built snaps to.
       - bool:

diff --git a/jobs/build-snaps/build-release-eks-snaps.groovy b/jobs/build-snaps/build-release-eks-snaps.groovy
@@ -2,6 +2,7 @@
 
 def kube_version = params.k8s_tag
 def kube_ersion = kube_version.substring(1)
+def channels = params.channels.tokenize(',').collect { kube_ersion + '/' + it }.join(',')
 def lxc_name = env.JOB_NAME+"-"+env.BUILD_NUMBER
 def _find_eks_base(version, override){
     if (override.length())
@@ -127,7 +128,7 @@ pipeline {
             steps {
                 script {
                     if(params.dry_run) {
-                        echo "Dry run; would have uploaded snaps to ${params.channels}"
+                        echo "Dry run; would have uploaded snaps to ${channels}"
                     } else {
                         sh """
                             BUILD_ARCH=\$(dpkg --print-architecture)
@@ -140,7 +141,7 @@ pipeline {
 
                                 echo "Uploading \${BUILT_SNAP}."
                                 sudo lxc shell ${lxc_name} -- bash -c \
-                                    "snapcraft -v upload /\${EKS_SNAP}/\${BUILT_SNAP} --release ${params.channels}"
+                                    "snapcraft -v upload /\${EKS_SNAP}/\${BUILT_SNAP} --release ${channels}"
                             done
                             sudo lxc shell ${lxc_name} -- bash -c "snapcraft logout"
                         """