Merge pull request #184 from hpidcock/improve-ci

Enable prometheus jobs + Move caas images to public.ecr.aws/jujuqabot
juju · Apr 12, 2024 · 2051261 · 2051261
2 parents 2fbb960 + 1f93d21
commit 2051261
Show file tree

Hide file tree

Showing 60 changed files with 289 additions and 1,496 deletions.
diff --git a/jobs/ci-run/build/buildjuju.yml b/jobs/ci-run/build/buildjuju.yml
@@ -159,13 +159,6 @@
           default: ""
           description: 'Go version used for build.'
           name: GOVERSION
-      - choice:
-          name: PARAM_OPERATOR_IMAGE_ACCOUNT
-          choices:
-            - docker.io/jujuqabot
-            - docker.io/jujusolutions
-          default: "docker.io/jujuqabot"
-          description: "Operator docker image account name."
       - string:
           default: "linux/amd64 linux/arm64 linux/s390x linux/ppc64el"
           description: "Space seperated list of Go Platforms to build the OCI images for"
@@ -183,15 +176,19 @@
           set -eu
 
           touch build.properties
-          echo "DOCKER_USERNAME=${PARAM_OPERATOR_IMAGE_ACCOUNT}" >> build.properties
+          echo "DOCKER_USERNAME=public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}" >> build.properties
 
           cat build.properties
       - inject:
           properties-file: build.properties
       - install-docker
       - docker-login
+      - ensure-aws-credentials
+      - docker-ecr-login
       - get-s3-build-payload-packaging:
           platforms: "${BUILD_PLATFORMS}"
+      - host-src-command:
+          src_command: !include-raw: ../scripts/snippet_setup_ecr_public.sh
       - host-src-command:
           src_command: !include-raw: ../scripts/snippet_caas-jujud-operator.sh
 

diff --git a/jobs/ci-run/ci-run-master.yml b/jobs/ci-run/ci-run-master.yml
@@ -96,7 +96,6 @@
       - get-s3-source-payload
       - inject:
           properties-content: |-
-            OPERATOR_IMAGE_ACCOUNT=docker.io/jujuqabot
             PATH=/snap/bin:$PATH
             series=focal
       - get-build-details

diff --git a/jobs/ci-run/functional/amd64/iaas-controller-deploy-caas-charms.yaml b/jobs/ci-run/functional/amd64/iaas-controller-deploy-caas-charms.yaml
@@ -17,13 +17,10 @@
           default: MICROK8S
           description: "Specify K8s cloud provider to use."
           name: CAAS_PROVIDER
-      - string:
-          default: docker.io/jujuqabot
-          description: "Operator docker image account name."
-          name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - cirun-test-stuck-timeout
     builders:
+      - select-oci-registry
       - prepare-functional-test-core:
           platform: "linux/${BUILD_ARCH}"
       - shell: |-
@@ -32,7 +29,7 @@
 
           ENV=parallel-lxd
           timeout -s INT 50m ${TESTS_DIR}/assess_caas_deploy_charms.py $ENV $JUJU_BIN $WORKSPACE/artifacts \
-          $JOB_NAME --caas-image-repo=${PARAM_OPERATOR_IMAGE_ACCOUNT} \
+          $JOB_NAME --caas-image-repo=$OPERATOR_IMAGE_ACCOUNT \
           --caas-provider=${CAAS_PROVIDER}
     publishers:
       - artifact-results
@@ -57,13 +54,10 @@
           default: "K8S_CORE"
           description: "Specify K8s cloud provider to use."
           name: CAAS_PROVIDER
-      - string:
-          default: "docker.io/jujuqabot"
-          description: "Operator docker image account name."
-          name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - cirun-test-stuck-timeout
     builders:
+      - select-oci-registry
       - prepare-functional-test-core:
           platform: "linux/${BUILD_ARCH}"
       - shell: |-
@@ -72,7 +66,7 @@
 
           ENV=parallel-lxd
           timeout -s INT 50m ${TESTS_DIR}/assess_caas_deploy_charms.py $ENV $JUJU_BIN $WORKSPACE/artifacts \
-          $JOB_NAME --caas-image-repo=${PARAM_OPERATOR_IMAGE_ACCOUNT} \
+          $JOB_NAME --caas-image-repo=$OPERATOR_IMAGE_ACCOUNT \
           --caas-provider=${CAAS_PROVIDER}
     publishers:
       - artifact-results

diff --git a/jobs/ci-run/functional/amd64/k8s-controller-deploy-caas-charms.yaml b/jobs/ci-run/functional/amd64/k8s-controller-deploy-caas-charms.yaml
@@ -16,13 +16,10 @@
           default: GKE
           description: "Specify K8s cloud provider to use."
           name: CAAS_PROVIDER
-      - string:
-          default: docker.io/jujuqabot
-          description: "Operator docker image account name."
-          name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - cirun-test-stuck-timeout
     builders:
+      - select-oci-registry
       - wait-for-cloud-init
       - get-cloud-environments
       - prepare-functional-test-core:
@@ -35,7 +32,7 @@
 
           ENV=gke
           timeout -s INT 50m ${TESTS_DIR}/assess_caas_deploy_charms.py $ENV $JUJU_BIN $WORKSPACE/artifacts \
-          $JOB_NAME --caas-image-repo=${PARAM_OPERATOR_IMAGE_ACCOUNT} \
+          $JOB_NAME --caas-image-repo=$OPERATOR_IMAGE_ACCOUNT \
           --caas-provider=${CAAS_PROVIDER} --k8s-controller --enable-rbac
     publishers:
       - artifact-results
@@ -59,13 +56,10 @@
           default: AKS
           description: "Specify K8s cloud provider to use."
           name: CAAS_PROVIDER
-      - string:
-          default: docker.io/jujuqabot
-          description: "Operator docker image account name."
-          name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - cirun-test-stuck-timeout
     builders:
+      - select-oci-registry
       - wait-for-cloud-init
       - get-cloud-environments
       - prepare-functional-test-core:
@@ -78,7 +72,7 @@
 
           ENV=aks
           timeout -s INT 50m ${TESTS_DIR}/assess_caas_deploy_charms.py $ENV $JUJU_BIN $WORKSPACE/artifacts \
-          $JOB_NAME --caas-image-repo=${PARAM_OPERATOR_IMAGE_ACCOUNT} \
+          $JOB_NAME --caas-image-repo=$OPERATOR_IMAGE_ACCOUNT \
           --caas-provider=${CAAS_PROVIDER} --k8s-controller --enable-rbac
     publishers:
       - artifact-results
@@ -103,13 +97,10 @@
           default: EKS
           description: "Specify K8s cloud provider to use."
           name: CAAS_PROVIDER
-      - string:
-          default: docker.io/jujuqabot
-          description: "Operator docker image account name."
-          name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - cirun-test-stuck-timeout
     builders:
+      - select-oci-registry
       - wait-for-cloud-init
       - get-cloud-environments
       - prepare-functional-test-core:
@@ -122,7 +113,7 @@
 
           ENV=eks
           timeout -s INT 50m ${TESTS_DIR}/assess_caas_deploy_charms.py $ENV $JUJU_BIN $WORKSPACE/artifacts \
-          $JOB_NAME --caas-image-repo=${PARAM_OPERATOR_IMAGE_ACCOUNT} \
+          $JOB_NAME --caas-image-repo=$OPERATOR_IMAGE_ACCOUNT \
           --caas-provider=${CAAS_PROVIDER} --k8s-controller --enable-rbac
     publishers:
       - artifact-results

diff --git a/jobs/ci-run/functional/amd64/k8s-controller-deploy-kubeflow.yml b/jobs/ci-run/functional/amd64/k8s-controller-deploy-kubeflow.yml
@@ -21,10 +21,6 @@
         default: MICROK8S
         description: "Specify K8s cloud provider to use."
         name: CAAS_PROVIDER
-    - string:
-        default: docker.io/jujuqabot
-        description: "Operator docker image account name."
-        name: PARAM_OPERATOR_IMAGE_ACCOUNT
     - string:
         default: full
         description: "Specify the kubeflow bundle version to deploy."
@@ -40,9 +36,10 @@
     wrappers:
     - cirun-test-stuck-timeout
     builders:
+    - select-oci-registry
     - wait-for-cloud-init
     - description-setter:
-        description: "${CAAS_PROVIDER}|bundle:${BUNDLE_VERSION}|build:${BUILD_CHARMS}|rbac:${ENABLE_RBAC}|${PARAM_OPERATOR_IMAGE_ACCOUNT}"
+        description: "${CAAS_PROVIDER}|bundle:${BUNDLE_VERSION}|build:${BUILD_CHARMS}|rbac:${ENABLE_RBAC}"
     - prepare-functional-test-core:
         platform: "linux/${BUILD_ARCH}"
     - prepare-ephemeral-node-for-k8s-py-tests:
@@ -73,7 +70,7 @@
             params+=( '--enable-rbac' )
         fi
         timeout -s INT 90m $TESTS_DIR/assess_caas_deploy_kubeflow.py $ENV $JUJU_BIN $WORKSPACE/artifacts \
-        $JOB_NAME --caas-image-repo=$PARAM_OPERATOR_IMAGE_ACCOUNT \
+        $JOB_NAME --caas-image-repo=$OPERATOR_IMAGE_ACCOUNT \
         --caas-provider=$CAAS_PROVIDER --k8s-controller --bundle=$BUNDLE_VERSION ${params[@]}
     publishers:
     - artifact-results

diff --git a/jobs/ci-run/integration/builders.yaml b/jobs/ci-run/integration/builders.yaml
@@ -1,14 +1,5 @@
 # utils related to integration tests
 # Prepare things for an integration test
-- builder:
-    name: 'registry-setup'
-    builders:
-    - host-src-command:
-        src_command:
-          !include-raw: "common/registry-setup.sh"
-    - inject:
-          properties-file: build.properties
-
 - builder:
     name: 'prepare-integration-test'
     builders:
@@ -36,9 +27,7 @@
     builders:
     - install-microk8s:
         channel: "latest/stable"
-    - install-docker
-    - ensure-aws-credentials
-    - registry-setup
+    - select-oci-registry
     - get-s3-build-payload-testing:
           SHORT_GIT_COMMIT: "${{SHORT_GIT_COMMIT}}"
           platform: "linux/${{BUILD_ARCH}}"

diff --git a/jobs/ci-run/integration/common/registry-setup.sh b/jobs/ci-run/integration/common/registry-setup.sh
diff --git a/jobs/ci-run/integration/gen/test-actions.yml b/jobs/ci-run/integration/gen/test-actions.yml
@@ -95,20 +95,14 @@
         default: ''
         description: 'Ubuntu series to use when bootstrapping Juju'
         name: BOOTSTRAP_SERIES
-    - string:
-        default: docker.io/jujuqabot
-        description: "Operator docker image account name."
-        name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - default-integration-test-wrapper
       - timeout:
           timeout: 30
           fail: true
           type: absolute
     builders:
-      - inject:
-          properties-content: |-
-            OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
+      - select-oci-registry
       - wait-for-cloud-init
       - prepare-integration-test
       - conditional-step:
@@ -179,20 +173,14 @@
         default: ''
         description: 'Ubuntu series to use when bootstrapping Juju'
         name: BOOTSTRAP_SERIES
-    - string:
-        default: docker.io/jujuqabot
-        description: "Operator docker image account name."
-        name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - default-integration-test-wrapper
       - timeout:
           timeout: 30
           fail: true
           type: absolute
     builders:
-      - inject:
-          properties-content: |-
-            OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
+      - select-oci-registry
       - wait-for-cloud-init
       - prepare-integration-test
       - conditional-step:
@@ -263,20 +251,14 @@
         default: ''
         description: 'Ubuntu series to use when bootstrapping Juju'
         name: BOOTSTRAP_SERIES
-    - string:
-        default: docker.io/jujuqabot
-        description: "Operator docker image account name."
-        name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - default-integration-test-wrapper
       - timeout:
           timeout: 30
           fail: true
           type: absolute
     builders:
-      - inject:
-          properties-content: |-
-            OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
+      - select-oci-registry
       - wait-for-cloud-init
       - prepare-integration-test
       - conditional-step:
@@ -343,20 +325,14 @@
         default: ''
         description: 'Ubuntu series to use when bootstrapping Juju'
         name: BOOTSTRAP_SERIES
-    - string:
-        default: docker.io/jujuqabot
-        description: "Operator docker image account name."
-        name: PARAM_OPERATOR_IMAGE_ACCOUNT
     wrappers:
       - default-integration-test-wrapper
       - timeout:
           timeout: 30
           fail: true
           type: absolute
     builders:
-      - inject:
-          properties-content: |-
-            OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
+      - select-oci-registry
       - wait-for-cloud-init
       - prepare-integration-test
       - conditional-step: