From 1f93d21687164591e713cd48bade2c53a13398a9 Mon Sep 17 00:00:00 2001 From: Harry Pidcock Date: Fri, 12 Apr 2024 14:11:53 +1000 Subject: [PATCH] Enable prometheus jobs + Move caas images to public.ecr.aws/jujuqabot --- jobs/ci-run/build/buildjuju.yml | 13 +- jobs/ci-run/ci-run-master.yml | 1 - .../iaas-controller-deploy-caas-charms.yaml | 14 +- .../k8s-controller-deploy-caas-charms.yaml | 21 +- .../amd64/k8s-controller-deploy-kubeflow.yml | 9 +- jobs/ci-run/integration/builders.yaml | 13 +- .../integration/common/registry-setup.sh | 54 ----- jobs/ci-run/integration/gen/test-actions.yml | 32 +-- jobs/ci-run/integration/gen/test-agents.yml | 16 +- jobs/ci-run/integration/gen/test-appdata.yml | 16 +- jobs/ci-run/integration/gen/test-backup.yml | 16 +- .../ci-run/integration/gen/test-bootstrap.yml | 8 +- jobs/ci-run/integration/gen/test-branches.yml | 32 +-- .../integration/gen/test-caasadmission.yml | 24 +- jobs/ci-run/integration/gen/test-charmhub.yml | 48 +--- jobs/ci-run/integration/gen/test-cli.yml | 56 +---- jobs/ci-run/integration/gen/test-cmr.yml | 16 +- .../integration/gen/test-constraints.yml | 16 +- .../integration/gen/test-controller.yml | 64 +----- .../integration/gen/test-controllercharm.yml | 128 ++--------- jobs/ci-run/integration/gen/test-coslite.yml | 8 +- .../integration/gen/test-credential.yml | 32 +-- .../ci-run/integration/gen/test-dashboard.yml | 40 +--- jobs/ci-run/integration/gen/test-deploy.yml | 96 +------- .../integration/gen/test-deploy_aks.yml | 8 +- .../integration/gen/test-deploy_caas.yml | 8 +- jobs/ci-run/integration/gen/test-firewall.yml | 24 +- jobs/ci-run/integration/gen/test-hooks.yml | 32 +-- .../ci-run/integration/gen/test-hooktools.yml | 16 +- jobs/ci-run/integration/gen/test-machine.yml | 16 +- jobs/ci-run/integration/gen/test-magma.yml | 8 +- jobs/ci-run/integration/gen/test-manual.yml | 32 +-- jobs/ci-run/integration/gen/test-model.yml | 216 +++--------------- jobs/ci-run/integration/gen/test-network.yml | 32 +-- jobs/ci-run/integration/gen/test-refresh.yml | 32 +-- .../ci-run/integration/gen/test-relations.yml | 48 +--- .../ci-run/integration/gen/test-resources.yml | 32 +-- .../integration/gen/test-secrets_iaas.yml | 40 +--- .../integration/gen/test-secrets_k8s.yml | 32 +-- jobs/ci-run/integration/gen/test-sidecar.yml | 30 +-- jobs/ci-run/integration/gen/test-smoke.yml | 32 +-- .../ci-run/integration/gen/test-smoke_k8s.yml | 8 +- .../integration/gen/test-spaces_ec2.yml | 24 +- jobs/ci-run/integration/gen/test-storage.yml | 16 +- jobs/ci-run/integration/gen/test-unit.yml | 16 +- jobs/ci-run/integration/gen/test-upgrade.yml | 8 +- .../integration/gen/test-upgrade_series.yml | 8 +- jobs/ci-run/integration/gen/test-user.yml | 48 +--- jobs/ci-run/integration/integrationtests.yml | 8 +- jobs/ci-run/integration/man/test-ck.yml | 9 +- jobs/ci-run/integration/man/test-kubeflow.yml | 8 +- .../scripts/snippet_caas-jujud-operator.sh | 8 +- .../scripts/snippet_oci-charm-base-build.sh | 56 ----- .../snippet_oci-charm-base-manifest.sh | 75 ------ .../scripts/snippet_setup_ecr_public.sh | 22 ++ jobs/common/pre-reqs.yaml | 17 ++ jobs/common/s3builders.yaml | 16 ++ tests/suites/static_analysis/lint_yaml.sh | 1 + tools/gen-wire-tests/juju.config | 6 + tools/gen-wire-tests/main.go | 20 +- 60 files changed, 289 insertions(+), 1496 deletions(-) delete mode 100644 jobs/ci-run/integration/common/registry-setup.sh delete mode 100644 jobs/ci-run/scripts/snippet_oci-charm-base-build.sh delete mode 100644 jobs/ci-run/scripts/snippet_oci-charm-base-manifest.sh create mode 100644 jobs/ci-run/scripts/snippet_setup_ecr_public.sh diff --git a/jobs/ci-run/build/buildjuju.yml b/jobs/ci-run/build/buildjuju.yml index 47b00b8..9eaba92 100644 --- 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 index 602df95..a101c84 100644 --- 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 index 6add9d5..2a6363d 100644 --- 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 index 3e65cb7..946c4f5 100644 --- 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 index 4b1ba1a..33db7dc 100644 --- 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 index 03ad8f0..3a7e5c0 100644 --- 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 deleted file mode 100644 index 4f565a5..0000000 --- a/jobs/ci-run/integration/common/registry-setup.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -set -eux - -if ! [ -x "$(command -v aws)" ]; then - sudo snap install aws-cli --classic || true -fi - -REGION="${REGION:-us-east-1}" -DOCKER_REGISTRY="$(aws ecr describe-registry --region "${REGION}" | jq -r '.registryId').dkr.ecr.${REGION}.amazonaws.com" -REPOSITORY_NAME_PREFIX="${JOB_NAME}-${JUJU_BUILD_NUMBER}" -OPERATOR_IMAGE_ACCOUNT="${DOCKER_REGISTRY}/${REPOSITORY_NAME_PREFIX}" - -ECR_TOKEN=$(aws ecr get-login-password --region "${REGION}") -aws ecr create-repository --repository-name "${REPOSITORY_NAME_PREFIX}/jujud-operator" || true -aws ecr create-repository --repository-name "${REPOSITORY_NAME_PREFIX}/juju-db" || true -aws ecr create-repository --repository-name "${REPOSITORY_NAME_PREFIX}/charm-base" || true - -JUJU_DB_TAG=$(grep -r 'DefaultJujuDBSnapChannel =' "${JUJU_SRC_PATH}/controller/config.go" | sed -r 's/^\s*DefaultJujuDBSnapChannel = \"([[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+){0,1})\/.*\"$/\1/') - -export OPERATOR_IMAGE_ACCOUNT -export ECR_TOKEN -export DOCKER_REGISTRY -export JUJU_DB_TAG - -# Capture env and start a new session to get new groups. -echo "${ECR_TOKEN}" | docker login -u AWS --password-stdin "${DOCKER_REGISTRY}" -DOCKER_USERNAME=${OPERATOR_IMAGE_ACCOUNT} make -C "${JUJU_SRC_PATH}" push-release-operator-image - -# Copy juju-db from docker -docker pull "public.ecr.aws/juju/juju-db:${JUJU_DB_TAG}" -docker tag "public.ecr.aws/juju/juju-db:${JUJU_DB_TAG}" "${OPERATOR_IMAGE_ACCOUNT}/juju-db:${JUJU_DB_TAG}" -docker push "${OPERATOR_IMAGE_ACCOUNT}/juju-db:${JUJU_DB_TAG}" - -# Copy LTS charm bases from docker -BASES=(18.04 20.04 22.04) -for BASE in "${BASES[@]}" ; do - docker pull "public.ecr.aws/juju/charm-base:ubuntu-${BASE}" - docker tag "public.ecr.aws/juju/charm-base:ubuntu-${BASE}" "${OPERATOR_IMAGE_ACCOUNT}/charm-base:ubuntu-${BASE}" - docker push "${OPERATOR_IMAGE_ACCOUNT}/charm-base:ubuntu-${BASE}" -done - -set +x -OPERATOR_IMAGE_ACCOUNT=$(jq -r --null-input \ - --arg repository "$OPERATOR_IMAGE_ACCOUNT" \ - --arg serveraddress "$DOCKER_REGISTRY" \ - --arg username "$(sed -n -e 's/^aws_access_key_id = //p' ~/.aws/credentials)" \ - --arg password "$(sed -n -e 's/^aws_secret_access_key = //p' ~/.aws/credentials)" \ - --arg region "$REGION" \ - '{"repository": $repository, "serveraddress": $serveraddress, "username": $username, "password": $password, "region": $region}') -OPERATOR_IMAGE_ACCOUNT_PATH="${WORKSPACE}/operator-image_account.json" -echo "${OPERATOR_IMAGE_ACCOUNT}" > "${OPERATOR_IMAGE_ACCOUNT_PATH}" -export OPERATOR_IMAGE_ACCOUNT=${OPERATOR_IMAGE_ACCOUNT_PATH} -echo "OPERATOR_IMAGE_ACCOUNT=${OPERATOR_IMAGE_ACCOUNT_PATH}" >> "${WORKSPACE}/build.properties" -set -x diff --git a/jobs/ci-run/integration/gen/test-actions.yml b/jobs/ci-run/integration/gen/test-actions.yml index a17018d..91635e8 100644 --- a/jobs/ci-run/integration/gen/test-actions.yml +++ b/jobs/ci-run/integration/gen/test-actions.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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,10 +173,6 @@ 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: @@ -190,9 +180,7 @@ 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,10 +251,6 @@ 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: @@ -274,9 +258,7 @@ 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,10 +325,6 @@ 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: @@ -354,9 +332,7 @@ 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: diff --git a/jobs/ci-run/integration/gen/test-agents.yml b/jobs/ci-run/integration/gen/test-agents.yml index c5b750d..f867327 100644 --- a/jobs/ci-run/integration/gen/test-agents.yml +++ b/jobs/ci-run/integration/gen/test-agents.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -165,10 +159,6 @@ 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: @@ -176,9 +166,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-appdata.yml b/jobs/ci-run/integration/gen/test-appdata.yml index a634b9b..3998ce1 100644 --- a/jobs/ci-run/integration/gen/test-appdata.yml +++ b/jobs/ci-run/integration/gen/test-appdata.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -165,10 +159,6 @@ 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: @@ -176,9 +166,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-backup.yml b/jobs/ci-run/integration/gen/test-backup.yml index 0299931..40241e0 100644 --- a/jobs/ci-run/integration/gen/test-backup.yml +++ b/jobs/ci-run/integration/gen/test-backup.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -165,10 +159,6 @@ 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: @@ -176,9 +166,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-bootstrap.yml b/jobs/ci-run/integration/gen/test-bootstrap.yml index 8320679..4e1c427 100644 --- a/jobs/ci-run/integration/gen/test-bootstrap.yml +++ b/jobs/ci-run/integration/gen/test-bootstrap.yml @@ -85,10 +85,6 @@ 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: @@ -96,9 +92,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-branches.yml b/jobs/ci-run/integration/gen/test-branches.yml index 867af47..15da3ee 100644 --- a/jobs/ci-run/integration/gen/test-branches.yml +++ b/jobs/ci-run/integration/gen/test-branches.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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 - run-integration-test: @@ -169,10 +163,6 @@ 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: @@ -180,9 +170,7 @@ 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 - run-integration-test: @@ -247,10 +235,6 @@ 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: @@ -258,9 +242,7 @@ 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 - run-integration-test: @@ -321,10 +303,6 @@ 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: @@ -332,9 +310,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-caasadmission.yml b/jobs/ci-run/integration/gen/test-caasadmission.yml index b630301..b1146cc 100644 --- a/jobs/ci-run/integration/gen/test-caasadmission.yml +++ b/jobs/ci-run/integration/gen/test-caasadmission.yml @@ -89,10 +89,6 @@ 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: @@ -100,9 +96,7 @@ 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 - run-integration-test-microk8s: @@ -163,10 +157,6 @@ 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: @@ -174,9 +164,7 @@ 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 - run-integration-test-microk8s: @@ -237,10 +225,6 @@ 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: @@ -248,9 +232,7 @@ 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 - run-integration-test-microk8s: diff --git a/jobs/ci-run/integration/gen/test-charmhub.yml b/jobs/ci-run/integration/gen/test-charmhub.yml index e850022..09c541c 100644 --- a/jobs/ci-run/integration/gen/test-charmhub.yml +++ b/jobs/ci-run/integration/gen/test-charmhub.yml @@ -99,10 +99,6 @@ 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: @@ -110,9 +106,7 @@ 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 - run-integration-test: @@ -173,10 +167,6 @@ 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: @@ -184,9 +174,7 @@ 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 - run-integration-test: @@ -251,10 +239,6 @@ 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: @@ -262,9 +246,7 @@ 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 - run-integration-test: @@ -325,10 +307,6 @@ 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: @@ -336,9 +314,7 @@ 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 - run-integration-test: @@ -403,10 +379,6 @@ 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: @@ -414,9 +386,7 @@ 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 - run-integration-test: @@ -477,10 +447,6 @@ 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: @@ -488,9 +454,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-cli.yml b/jobs/ci-run/integration/gen/test-cli.yml index e1ade04..2cf4a20 100644 --- a/jobs/ci-run/integration/gen/test-cli.yml +++ b/jobs/ci-run/integration/gen/test-cli.yml @@ -97,10 +97,6 @@ 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: @@ -108,9 +104,7 @@ 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 - run-integration-test: @@ -171,10 +165,6 @@ 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: @@ -182,9 +172,7 @@ 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 - run-integration-test: @@ -245,10 +233,6 @@ 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: @@ -256,9 +240,7 @@ 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 - run-integration-test: @@ -319,10 +301,6 @@ 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: @@ -330,9 +308,7 @@ 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 - run-integration-test: @@ -393,10 +369,6 @@ 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: @@ -404,9 +376,7 @@ 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 - run-integration-test: @@ -467,10 +437,6 @@ 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: @@ -478,9 +444,7 @@ 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 - run-integration-test: @@ -541,10 +505,6 @@ 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: @@ -552,9 +512,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-cmr.yml b/jobs/ci-run/integration/gen/test-cmr.yml index 7bfc006..35bc1fa 100644 --- a/jobs/ci-run/integration/gen/test-cmr.yml +++ b/jobs/ci-run/integration/gen/test-cmr.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -165,10 +159,6 @@ 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: @@ -176,9 +166,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-constraints.yml b/jobs/ci-run/integration/gen/test-constraints.yml index 7e18a6f..660872b 100644 --- a/jobs/ci-run/integration/gen/test-constraints.yml +++ b/jobs/ci-run/integration/gen/test-constraints.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -165,10 +159,6 @@ 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: @@ -176,9 +166,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-controller.yml b/jobs/ci-run/integration/gen/test-controller.yml index a50a11c..01ed26f 100644 --- a/jobs/ci-run/integration/gen/test-controller.yml +++ b/jobs/ci-run/integration/gen/test-controller.yml @@ -103,10 +103,6 @@ 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: @@ -114,9 +110,7 @@ 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 - run-integration-test: @@ -177,10 +171,6 @@ 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: @@ -188,9 +178,7 @@ 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 - run-integration-test: @@ -255,10 +243,6 @@ 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: @@ -266,9 +250,7 @@ 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 - run-integration-test: @@ -329,10 +311,6 @@ 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: @@ -340,9 +318,7 @@ 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 - run-integration-test: @@ -407,10 +383,6 @@ 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: @@ -418,9 +390,7 @@ 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 - run-integration-test: @@ -481,10 +451,6 @@ 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: @@ -492,9 +458,7 @@ 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 - run-integration-test: @@ -559,10 +523,6 @@ 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: @@ -570,9 +530,7 @@ 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: @@ -639,10 +597,6 @@ 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: @@ -650,9 +604,7 @@ 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: diff --git a/jobs/ci-run/integration/gen/test-controllercharm.yml b/jobs/ci-run/integration/gen/test-controllercharm.yml index 28f730d..5b68663 100644 --- a/jobs/ci-run/integration/gen/test-controllercharm.yml +++ b/jobs/ci-run/integration/gen/test-controllercharm.yml @@ -32,91 +32,11 @@ - multijob: name: 'IntegrationTests-controllercharm' projects: - - name: 'test-controllercharm-test-prometheus-aws' - current-parameters: true - name: 'test-controllercharm-test-prometheus-lxd' current-parameters: true - name: 'test-controllercharm-test-prometheus-microk8s' current-parameters: true -- job: - name: test-controllercharm-test-prometheus-aws - node: ephemeral-focal-small-amd64 - description: |- - Test controllercharm suite on aws - parameters: - - validating-string: - name: SHORT_GIT_COMMIT - description: 'Enable sub job to be run individually.' - regex: ^\S{7}$ - msg: Enter a valid 7 char git sha - - choice: - default: 'amd64' - description: 'Build arch used to download the build tar.gz.' - name: BUILD_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used to boostrap controller.' - name: BOOTSTRAP_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - choice: - default: '' - description: 'Arch used for hosted models.' - name: MODEL_ARCH - choices: - - amd64 - - arm64 - - s390x - - ppc64el - - string: - default: 'aws' - description: 'Cloud to use when bootstrapping Juju' - name: BOOTSTRAP_CLOUD - - string: - default: 'ec2' - description: 'Provider to use when bootstrapping Juju' - name: BOOTSTRAP_PROVIDER - - string: - default: 'us-east-1' - description: 'Cloud Region to use when bootstrapping Juju' - name: BOOTSTRAP_REGION - - string: - 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} - - wait-for-cloud-init - - prepare-integration-test - - run-integration-test: - test_name: 'controllercharm' - setup_steps: '' - task_name: '' - skip_tasks: '' - publishers: - - integration-artifacts - - job: name: test-controllercharm-test-prometheus-lxd node: ephemeral-focal-8c-32g-amd64 @@ -167,10 +87,6 @@ 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: @@ -178,16 +94,20 @@ 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 - - run-integration-test: - test_name: 'controllercharm' - setup_steps: '' - task_name: '' - skip_tasks: '' + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([3-9]|\\d{2,})(\\.|-).*" + label: "${JUJU_VERSION}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test-microk8s: + test_name: 'controllercharm' + setup_steps: '' + task_name: '' + skip_tasks: '' publishers: - integration-artifacts @@ -241,10 +161,6 @@ 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: @@ -252,15 +168,19 @@ 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 - - run-integration-test-microk8s: - test_name: 'controllercharm' - setup_steps: '' - task_name: '' - skip_tasks: '' + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([3-9]|\\d{2,})(\\.|-).*" + label: "${JUJU_VERSION}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test-microk8s: + test_name: 'controllercharm' + setup_steps: '' + task_name: '' + skip_tasks: '' publishers: - integration-artifacts diff --git a/jobs/ci-run/integration/gen/test-coslite.yml b/jobs/ci-run/integration/gen/test-coslite.yml index 17dd014..a455d5a 100644 --- a/jobs/ci-run/integration/gen/test-coslite.yml +++ b/jobs/ci-run/integration/gen/test-coslite.yml @@ -85,10 +85,6 @@ 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: @@ -96,9 +92,7 @@ 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: diff --git a/jobs/ci-run/integration/gen/test-credential.yml b/jobs/ci-run/integration/gen/test-credential.yml index a0d45e8..25cbd08 100644 --- a/jobs/ci-run/integration/gen/test-credential.yml +++ b/jobs/ci-run/integration/gen/test-credential.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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 - run-integration-test: @@ -169,10 +163,6 @@ 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: @@ -180,9 +170,7 @@ 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 - run-integration-test: @@ -247,10 +235,6 @@ 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: @@ -258,9 +242,7 @@ 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 - run-integration-test: @@ -321,10 +303,6 @@ 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: @@ -332,9 +310,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-dashboard.yml b/jobs/ci-run/integration/gen/test-dashboard.yml index 7dc1768..212f67a 100644 --- a/jobs/ci-run/integration/gen/test-dashboard.yml +++ b/jobs/ci-run/integration/gen/test-dashboard.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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,10 +173,6 @@ 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: @@ -190,9 +180,7 @@ 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,10 +251,6 @@ 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: @@ -274,9 +258,7 @@ 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,10 +325,6 @@ 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: @@ -354,9 +332,7 @@ 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: @@ -423,10 +399,6 @@ 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: @@ -434,9 +406,7 @@ 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: diff --git a/jobs/ci-run/integration/gen/test-deploy.yml b/jobs/ci-run/integration/gen/test-deploy.yml index 5711403..ebb0083 100644 --- a/jobs/ci-run/integration/gen/test-deploy.yml +++ b/jobs/ci-run/integration/gen/test-deploy.yml @@ -107,10 +107,6 @@ 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: @@ -118,9 +114,7 @@ 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 - run-integration-test: @@ -181,10 +175,6 @@ 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: @@ -192,9 +182,7 @@ 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 - run-integration-test: @@ -259,10 +247,6 @@ 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: @@ -270,9 +254,7 @@ 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 - run-integration-test: @@ -333,10 +315,6 @@ 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: @@ -344,9 +322,7 @@ 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 - run-integration-test: @@ -411,10 +387,6 @@ 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: @@ -422,9 +394,7 @@ 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 - run-integration-test: @@ -485,10 +455,6 @@ 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: @@ -496,9 +462,7 @@ 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 - run-integration-test: @@ -563,10 +527,6 @@ 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: @@ -574,9 +534,7 @@ 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 - run-integration-test: @@ -637,10 +595,6 @@ 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: @@ -648,9 +602,7 @@ 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 - run-integration-test: @@ -715,10 +667,6 @@ 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: @@ -726,9 +674,7 @@ 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 - run-integration-test: @@ -789,10 +735,6 @@ 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: @@ -800,9 +742,7 @@ 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 - run-integration-test: @@ -867,10 +807,6 @@ 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: @@ -878,9 +814,7 @@ 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 - run-integration-test: @@ -941,10 +875,6 @@ 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: @@ -952,9 +882,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-deploy_aks.yml b/jobs/ci-run/integration/gen/test-deploy_aks.yml index cd3e7eb..7b02c03 100644 --- a/jobs/ci-run/integration/gen/test-deploy_aks.yml +++ b/jobs/ci-run/integration/gen/test-deploy_aks.yml @@ -89,10 +89,6 @@ 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: @@ -100,9 +96,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-deploy_caas.yml b/jobs/ci-run/integration/gen/test-deploy_caas.yml index 422f47c..e863321 100644 --- a/jobs/ci-run/integration/gen/test-deploy_caas.yml +++ b/jobs/ci-run/integration/gen/test-deploy_caas.yml @@ -85,10 +85,6 @@ 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: @@ -96,9 +92,7 @@ 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 - run-integration-test-microk8s: diff --git a/jobs/ci-run/integration/gen/test-firewall.yml b/jobs/ci-run/integration/gen/test-firewall.yml index fdab7fa..ddef831 100644 --- a/jobs/ci-run/integration/gen/test-firewall.yml +++ b/jobs/ci-run/integration/gen/test-firewall.yml @@ -93,10 +93,6 @@ 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: @@ -104,9 +100,7 @@ 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 - run-integration-test: @@ -171,10 +165,6 @@ 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: @@ -182,9 +172,7 @@ 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 - run-integration-test: @@ -249,10 +237,6 @@ 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: @@ -260,9 +244,7 @@ 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: diff --git a/jobs/ci-run/integration/gen/test-hooks.yml b/jobs/ci-run/integration/gen/test-hooks.yml index e379849..93e9034 100644 --- a/jobs/ci-run/integration/gen/test-hooks.yml +++ b/jobs/ci-run/integration/gen/test-hooks.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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 - run-integration-test: @@ -169,10 +163,6 @@ 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: @@ -180,9 +170,7 @@ 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 - run-integration-test: @@ -247,10 +235,6 @@ 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: @@ -258,9 +242,7 @@ 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 - run-integration-test: @@ -321,10 +303,6 @@ 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: @@ -332,9 +310,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-hooktools.yml b/jobs/ci-run/integration/gen/test-hooktools.yml index 4af7fba..62ded65 100644 --- a/jobs/ci-run/integration/gen/test-hooktools.yml +++ b/jobs/ci-run/integration/gen/test-hooktools.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -165,10 +159,6 @@ 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: @@ -176,9 +166,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-machine.yml b/jobs/ci-run/integration/gen/test-machine.yml index 5309c2b..8476c9a 100644 --- a/jobs/ci-run/integration/gen/test-machine.yml +++ b/jobs/ci-run/integration/gen/test-machine.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -165,10 +159,6 @@ 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: @@ -176,9 +166,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-magma.yml b/jobs/ci-run/integration/gen/test-magma.yml index be4231a..252f46a 100644 --- a/jobs/ci-run/integration/gen/test-magma.yml +++ b/jobs/ci-run/integration/gen/test-magma.yml @@ -85,10 +85,6 @@ 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: @@ -96,9 +92,7 @@ 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 - run-integration-test-microk8s: diff --git a/jobs/ci-run/integration/gen/test-manual.yml b/jobs/ci-run/integration/gen/test-manual.yml index 101158e..cb2f99f 100644 --- a/jobs/ci-run/integration/gen/test-manual.yml +++ b/jobs/ci-run/integration/gen/test-manual.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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 - run-integration-test: @@ -169,10 +163,6 @@ 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: @@ -180,9 +170,7 @@ 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 - run-integration-test: @@ -247,10 +235,6 @@ 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: @@ -258,9 +242,7 @@ 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 - run-integration-test: @@ -321,10 +303,6 @@ 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: @@ -332,9 +310,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-model.yml b/jobs/ci-run/integration/gen/test-model.yml index 6dc4bb7..963ce78 100644 --- a/jobs/ci-run/integration/gen/test-model.yml +++ b/jobs/ci-run/integration/gen/test-model.yml @@ -129,10 +129,6 @@ 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: @@ -140,9 +136,7 @@ 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 - run-integration-test: @@ -207,10 +201,6 @@ 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: @@ -218,9 +208,7 @@ 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 - run-integration-test: @@ -281,10 +269,6 @@ 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: @@ -292,9 +276,7 @@ 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 - run-integration-test: @@ -359,10 +341,6 @@ 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: @@ -370,9 +348,7 @@ 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 - run-integration-test: @@ -437,10 +413,6 @@ 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: @@ -448,9 +420,7 @@ 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 - run-integration-test: @@ -511,10 +481,6 @@ 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: @@ -522,9 +488,7 @@ 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 - run-integration-test: @@ -589,10 +553,6 @@ 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: @@ -600,9 +560,7 @@ 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 - run-integration-test: @@ -667,10 +625,6 @@ 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: @@ -678,9 +632,7 @@ 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 - run-integration-test: @@ -741,10 +693,6 @@ 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: @@ -752,9 +700,7 @@ 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 - run-integration-test: @@ -819,10 +765,6 @@ 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: @@ -830,9 +772,7 @@ 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 - run-integration-test: @@ -897,10 +837,6 @@ 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: @@ -908,9 +844,7 @@ 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 - run-integration-test: @@ -971,10 +905,6 @@ 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: @@ -982,9 +912,7 @@ 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 - run-integration-test: @@ -1049,10 +977,6 @@ 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: @@ -1060,9 +984,7 @@ 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 - run-integration-test: @@ -1127,10 +1049,6 @@ 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: @@ -1138,9 +1056,7 @@ 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 - run-integration-test: @@ -1201,10 +1117,6 @@ 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: @@ -1212,9 +1124,7 @@ 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 - run-integration-test: @@ -1279,10 +1189,6 @@ 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: @@ -1290,9 +1196,7 @@ 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 - run-integration-test: @@ -1357,10 +1261,6 @@ 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: @@ -1368,9 +1268,7 @@ 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 - run-integration-test: @@ -1431,10 +1329,6 @@ 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: @@ -1442,9 +1336,7 @@ 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 - run-integration-test: @@ -1509,10 +1401,6 @@ 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: @@ -1520,9 +1408,7 @@ 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 - run-integration-test: @@ -1587,10 +1473,6 @@ 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: @@ -1598,9 +1480,7 @@ 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 - run-integration-test: @@ -1661,10 +1541,6 @@ 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: @@ -1672,9 +1548,7 @@ 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 - run-integration-test: @@ -1739,10 +1613,6 @@ 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: @@ -1750,9 +1620,7 @@ 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 - run-integration-test: @@ -1817,10 +1685,6 @@ 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: @@ -1828,9 +1692,7 @@ 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 - run-integration-test: @@ -1891,10 +1753,6 @@ 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: @@ -1902,9 +1760,7 @@ 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 - run-integration-test: @@ -1969,10 +1825,6 @@ 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: @@ -1980,9 +1832,7 @@ 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 - run-integration-test: @@ -2047,10 +1897,6 @@ 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: @@ -2058,9 +1904,7 @@ 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 - run-integration-test: @@ -2121,10 +1965,6 @@ 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: @@ -2132,9 +1972,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-network.yml b/jobs/ci-run/integration/gen/test-network.yml index 6c14fd4..7e03e9a 100644 --- a/jobs/ci-run/integration/gen/test-network.yml +++ b/jobs/ci-run/integration/gen/test-network.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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 - run-integration-test: @@ -173,10 +167,6 @@ 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: @@ -184,9 +174,7 @@ 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 - run-integration-test: @@ -251,10 +239,6 @@ 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: @@ -262,9 +246,7 @@ 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 - run-integration-test: @@ -325,10 +307,6 @@ 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: @@ -336,9 +314,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-refresh.yml b/jobs/ci-run/integration/gen/test-refresh.yml index 1a05f17..a053191 100644 --- a/jobs/ci-run/integration/gen/test-refresh.yml +++ b/jobs/ci-run/integration/gen/test-refresh.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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 - run-integration-test: @@ -169,10 +163,6 @@ 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: @@ -180,9 +170,7 @@ 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 - run-integration-test: @@ -247,10 +235,6 @@ 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: @@ -258,9 +242,7 @@ 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 - run-integration-test: @@ -321,10 +303,6 @@ 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: @@ -332,9 +310,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-relations.yml b/jobs/ci-run/integration/gen/test-relations.yml index e71e7b5..d56dce0 100644 --- a/jobs/ci-run/integration/gen/test-relations.yml +++ b/jobs/ci-run/integration/gen/test-relations.yml @@ -99,10 +99,6 @@ 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: @@ -110,9 +106,7 @@ 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 - run-integration-test: @@ -173,10 +167,6 @@ 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: @@ -184,9 +174,7 @@ 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 - run-integration-test: @@ -251,10 +239,6 @@ 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: @@ -262,9 +246,7 @@ 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 - run-integration-test: @@ -325,10 +307,6 @@ 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: @@ -336,9 +314,7 @@ 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 - run-integration-test: @@ -403,10 +379,6 @@ 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: @@ -414,9 +386,7 @@ 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 - run-integration-test: @@ -477,10 +447,6 @@ 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: @@ -488,9 +454,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-resources.yml b/jobs/ci-run/integration/gen/test-resources.yml index 7abcda1..15a1ed6 100644 --- a/jobs/ci-run/integration/gen/test-resources.yml +++ b/jobs/ci-run/integration/gen/test-resources.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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 - run-integration-test: @@ -169,10 +163,6 @@ 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: @@ -180,9 +170,7 @@ 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 - run-integration-test: @@ -247,10 +235,6 @@ 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: @@ -258,9 +242,7 @@ 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 - run-integration-test: @@ -321,10 +303,6 @@ 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: @@ -332,9 +310,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-secrets_iaas.yml b/jobs/ci-run/integration/gen/test-secrets_iaas.yml index fe9774f..3d4d090 100644 --- a/jobs/ci-run/integration/gen/test-secrets_iaas.yml +++ b/jobs/ci-run/integration/gen/test-secrets_iaas.yml @@ -93,10 +93,6 @@ 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: @@ -104,9 +100,7 @@ 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: @@ -173,10 +167,6 @@ 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: @@ -184,9 +174,7 @@ 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: @@ -253,10 +241,6 @@ 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: @@ -264,9 +248,7 @@ 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: @@ -333,10 +315,6 @@ 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: @@ -344,9 +322,7 @@ 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: @@ -413,10 +389,6 @@ 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: @@ -424,9 +396,7 @@ 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: diff --git a/jobs/ci-run/integration/gen/test-secrets_k8s.yml b/jobs/ci-run/integration/gen/test-secrets_k8s.yml index 8c097e4..29644eb 100644 --- a/jobs/ci-run/integration/gen/test-secrets_k8s.yml +++ b/jobs/ci-run/integration/gen/test-secrets_k8s.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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: @@ -171,10 +165,6 @@ 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: @@ -182,9 +172,7 @@ 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: @@ -251,10 +239,6 @@ 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: @@ -262,9 +246,7 @@ 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: @@ -331,10 +313,6 @@ 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: @@ -342,9 +320,7 @@ 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: diff --git a/jobs/ci-run/integration/gen/test-sidecar.yml b/jobs/ci-run/integration/gen/test-sidecar.yml index b0b3656..345759b 100644 --- a/jobs/ci-run/integration/gen/test-sidecar.yml +++ b/jobs/ci-run/integration/gen/test-sidecar.yml @@ -89,10 +89,6 @@ 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: @@ -100,16 +96,14 @@ 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 - run-integration-test-microk8s: test_name: 'sidecar' setup_steps: '' task_name: 'test_deploy_and_force_remove_application' - skip_tasks: 'test_deploy_and_remove_application,test_pebble_notices' + skip_tasks: 'test_deploy_and_remove_application,test_pebble_notices,test_pebble_change_updated' publishers: - integration-artifacts @@ -163,10 +157,6 @@ 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: @@ -174,16 +164,14 @@ 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 - run-integration-test-microk8s: test_name: 'sidecar' setup_steps: '' task_name: 'test_deploy_and_remove_application' - skip_tasks: 'test_deploy_and_force_remove_application,test_pebble_notices' + skip_tasks: 'test_deploy_and_force_remove_application,test_pebble_notices,test_pebble_change_updated' publishers: - integration-artifacts @@ -237,10 +225,6 @@ 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: @@ -248,9 +232,7 @@ 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,6 +245,6 @@ test_name: 'sidecar' setup_steps: '' task_name: 'test_pebble_notices' - skip_tasks: 'test_deploy_and_force_remove_application,test_deploy_and_remove_application' + skip_tasks: 'test_deploy_and_force_remove_application,test_deploy_and_remove_application,test_pebble_change_updated' publishers: - integration-artifacts diff --git a/jobs/ci-run/integration/gen/test-smoke.yml b/jobs/ci-run/integration/gen/test-smoke.yml index c91b061..1c3cb54 100644 --- a/jobs/ci-run/integration/gen/test-smoke.yml +++ b/jobs/ci-run/integration/gen/test-smoke.yml @@ -95,10 +95,6 @@ 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: @@ -106,9 +102,7 @@ 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 - run-integration-test: @@ -169,10 +163,6 @@ 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: @@ -180,9 +170,7 @@ 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 - run-integration-test: @@ -247,10 +235,6 @@ 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: @@ -258,9 +242,7 @@ 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 - run-integration-test: @@ -321,10 +303,6 @@ 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: @@ -332,9 +310,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-smoke_k8s.yml b/jobs/ci-run/integration/gen/test-smoke_k8s.yml index 814c913..d8089f5 100644 --- a/jobs/ci-run/integration/gen/test-smoke_k8s.yml +++ b/jobs/ci-run/integration/gen/test-smoke_k8s.yml @@ -85,10 +85,6 @@ 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: @@ -96,9 +92,7 @@ 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: diff --git a/jobs/ci-run/integration/gen/test-spaces_ec2.yml b/jobs/ci-run/integration/gen/test-spaces_ec2.yml index 387d30c..0267b34 100644 --- a/jobs/ci-run/integration/gen/test-spaces_ec2.yml +++ b/jobs/ci-run/integration/gen/test-spaces_ec2.yml @@ -93,10 +93,6 @@ 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: @@ -104,9 +100,7 @@ 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 - run-integration-test: @@ -171,10 +165,6 @@ 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: @@ -182,9 +172,7 @@ 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 - run-integration-test: @@ -249,10 +237,6 @@ 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: @@ -260,9 +244,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-storage.yml b/jobs/ci-run/integration/gen/test-storage.yml index 6df1539..3b02df4 100644 --- a/jobs/ci-run/integration/gen/test-storage.yml +++ b/jobs/ci-run/integration/gen/test-storage.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -169,10 +163,6 @@ 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: @@ -180,9 +170,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-unit.yml b/jobs/ci-run/integration/gen/test-unit.yml index 79f64b1..f19e87b 100644 --- a/jobs/ci-run/integration/gen/test-unit.yml +++ b/jobs/ci-run/integration/gen/test-unit.yml @@ -91,10 +91,6 @@ 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: @@ -102,9 +98,7 @@ 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 - run-integration-test: @@ -165,10 +159,6 @@ 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: @@ -176,9 +166,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-upgrade.yml b/jobs/ci-run/integration/gen/test-upgrade.yml index 5d4fd06..5a223fb 100644 --- a/jobs/ci-run/integration/gen/test-upgrade.yml +++ b/jobs/ci-run/integration/gen/test-upgrade.yml @@ -85,10 +85,6 @@ 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: @@ -96,9 +92,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-upgrade_series.yml b/jobs/ci-run/integration/gen/test-upgrade_series.yml index d675602..b44d36a 100644 --- a/jobs/ci-run/integration/gen/test-upgrade_series.yml +++ b/jobs/ci-run/integration/gen/test-upgrade_series.yml @@ -85,10 +85,6 @@ 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: @@ -96,9 +92,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/gen/test-user.yml b/jobs/ci-run/integration/gen/test-user.yml index 0820277..331d098 100644 --- a/jobs/ci-run/integration/gen/test-user.yml +++ b/jobs/ci-run/integration/gen/test-user.yml @@ -99,10 +99,6 @@ 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: @@ -110,9 +106,7 @@ 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 - run-integration-test: @@ -173,10 +167,6 @@ 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: @@ -184,9 +174,7 @@ 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 - run-integration-test: @@ -251,10 +239,6 @@ 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: @@ -262,9 +246,7 @@ 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 - run-integration-test: @@ -325,10 +307,6 @@ 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: @@ -336,9 +314,7 @@ 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 - run-integration-test: @@ -403,10 +379,6 @@ 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: @@ -414,9 +386,7 @@ 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 - run-integration-test: @@ -477,10 +447,6 @@ 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: @@ -488,9 +454,7 @@ 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 - run-integration-test: diff --git a/jobs/ci-run/integration/integrationtests.yml b/jobs/ci-run/integration/integrationtests.yml index cab79fd..c912adf 100644 --- a/jobs/ci-run/integration/integrationtests.yml +++ b/jobs/ci-run/integration/integrationtests.yml @@ -118,6 +118,10 @@ current-parameters: true predefined-parameters: |- BUILD_ARCH=amd64 + - name: 'test-controllercharm-multijob' + current-parameters: true + predefined-parameters: |- + BUILD_ARCH=amd64 - name: 'test-coslite-multijob' current-parameters: true predefined-parameters: |- @@ -259,10 +263,6 @@ current-parameters: true predefined-parameters: |- BUILD_ARCH=amd64 - - name: 'test-controllercharm-multijob' - current-parameters: true - predefined-parameters: |- - BUILD_ARCH=amd64 - name: 'test-dashboard-unstable-multijob' current-parameters: true predefined-parameters: |- diff --git a/jobs/ci-run/integration/man/test-ck.yml b/jobs/ci-run/integration/man/test-ck.yml index 6fc0aeb..2f2a678 100644 --- a/jobs/ci-run/integration/man/test-ck.yml +++ b/jobs/ci-run/integration/man/test-ck.yml @@ -36,23 +36,18 @@ 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 builders: + - select-oci-registry - wait-for-cloud-init - prepare-integration-test - install-common-tools - install-docker - - ensure-aws-credentials - run-integration-test: test_name: "ck" task_name: '' skip_tasks: '' - setup_steps: - !include-raw: "../common/registry-setup.sh" + setup_steps: '' publishers: - integration-artifacts diff --git a/jobs/ci-run/integration/man/test-kubeflow.yml b/jobs/ci-run/integration/man/test-kubeflow.yml index 6e3ec92..64e377a 100644 --- a/jobs/ci-run/integration/man/test-kubeflow.yml +++ b/jobs/ci-run/integration/man/test-kubeflow.yml @@ -50,10 +50,6 @@ 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: @@ -61,14 +57,12 @@ fail: true type: absolute builders: + - select-oci-registry - wait-for-cloud-init - prepare-integration-test - install-microk8s: channel: "1.22/stable" - - install-docker - install-charmcraft - - ensure-aws-credentials - - registry-setup - get-s3-build-payload-testing: SHORT_GIT_COMMIT: "${SHORT_GIT_COMMIT}" platform: "linux/${BUILD_ARCH}" diff --git a/jobs/ci-run/scripts/snippet_caas-jujud-operator.sh b/jobs/ci-run/scripts/snippet_caas-jujud-operator.sh index 9edc449..46ba0f5 100644 --- a/jobs/ci-run/scripts/snippet_caas-jujud-operator.sh +++ b/jobs/ci-run/scripts/snippet_caas-jujud-operator.sh @@ -6,8 +6,6 @@ cd ${JUJU_SRC_PATH} # DO NOT build jujud here, and always copy from existing build. export OPERATOR_IMAGE_BUILD_SRC=false -if [ -z "${JUJU_BUILD_NUMBER+''}" ]; then - OCI_IMAGE_PLATFORMS="${BUILD_PLATFORMS//,/ }" make push-release-operator-image -else - OCI_IMAGE_PLATFORMS="${BUILD_PLATFORMS//,/ }" make push-operator-image -fi +# push both build number and non-build number tags +JUJU_BUILD_NUMBER=0 OCI_IMAGE_PLATFORMS="${BUILD_PLATFORMS//,/ }" make push-release-operator-image +OCI_IMAGE_PLATFORMS="${BUILD_PLATFORMS//,/ }" make push-operator-image diff --git a/jobs/ci-run/scripts/snippet_oci-charm-base-build.sh b/jobs/ci-run/scripts/snippet_oci-charm-base-build.sh deleted file mode 100644 index 27a1dbb..0000000 --- a/jobs/ci-run/scripts/snippet_oci-charm-base-build.sh +++ /dev/null @@ -1,56 +0,0 @@ -set -eux - -cd ${build_dir} - -# wait for 10s until device ready. -# error: too early for operation, device not yet seeded or device model not acknowledged -sleep 10 - -# Enabled experimental docker features, must be before login. -# Also add http proxy if we have one -mkdir -p "${HOME}/.docker" -if [ ! -z "${http_proxy:-}" ]; then -cat << EOC > ${HOME}/.docker/config.json -{ - "experimental": "enabled", - "proxies": { - "default": { - "httpProxy": "${http_proxy}", - "httpsProxy": "${http_proxy}" - } - } -} -EOC -else -cat << EOC > ${HOME}/.docker/config.json -{ - "experimental": "enabled" -} -EOC -fi - -set +x -[ -f ${HOME}/juju_lxd_env ] && export $(grep -v '^#' ${HOME}/juju_lxd_env | xargs) -echo ${DOCKERHUB_P} | docker login -u ${DOCKERHUB_U} --password-stdin -set -x - -export DOCKER_USERNAME=${OPERATOR_IMAGE_ACCOUNT} - -git clone https://github.com/juju/charm-base-images.git -cd charm-base-images - -if ! which go > /dev/null ; then - sudo snap install go --classic -fi - -make build - -docker images - -( - IFS=$'\n' - make print-image-tags | while read -r line; do - docker push ${OPERATOR_IMAGE_ACCOUNT}/charm-base:${line} - done -) - diff --git a/jobs/ci-run/scripts/snippet_oci-charm-base-manifest.sh b/jobs/ci-run/scripts/snippet_oci-charm-base-manifest.sh deleted file mode 100644 index b1d9f9c..0000000 --- a/jobs/ci-run/scripts/snippet_oci-charm-base-manifest.sh +++ /dev/null @@ -1,75 +0,0 @@ -set -eux - -cd ${build_dir} - -# wait for 10s until device ready. -# error: too early for operation, device not yet seeded or device model not acknowledged -sleep 10 - -# Enabled experimental docker features, must be before login. -# Also add http proxy if we have one -mkdir -p "${HOME}/.docker" -if [ ! -z "${http_proxy:-}" ]; then -cat << EOC > ${HOME}/.docker/config.json -{ - "experimental": "enabled", - "proxies": { - "default": { - "httpProxy": "${http_proxy}", - "httpsProxy": "${http_proxy}" - } - } -} -EOC -else -cat << EOC > ${HOME}/.docker/config.json -{ - "experimental": "enabled" -} -EOC -fi - -# Check we can use docker manifest -docker manifest --help - -set +x -[ -f ${HOME}/juju_lxd_env ] && export $(grep -v '^#' ${HOME}/juju_lxd_env | xargs) -echo ${DOCKERHUB_P} | docker login -u ${DOCKERHUB_U} --password-stdin -set -x - -export DOCKER_USERNAME=${OPERATOR_IMAGE_ACCOUNT} - -git clone https://github.com/juju/charm-base-images.git -cd charm-base-images - -if ! which go > /dev/null ; then - sudo snap install go --classic -fi - -( - IFS=$'\n' - make print-image-tags | while read -r tag; do - IMAGE_PATH=${OPERATOR_IMAGE_ACCOUNT}/charm-base:${tag} - - echo "Creating manifest for ${IMAGE_PATH}..." - AMD64_IMAGE_PATH=${OPERATOR_IMAGE_ACCOUNT_PREFIX}amd64/charm-base:${tag} - ARM64_IMAGE_PATH=${OPERATOR_IMAGE_ACCOUNT_PREFIX}arm64/charm-base:${tag} - PPC64LE_IMAGE_PATH=${OPERATOR_IMAGE_ACCOUNT_PREFIX}ppc64le/charm-base:${tag} - S390X_IMAGE_PATH=${OPERATOR_IMAGE_ACCOUNT_PREFIX}s390x/charm-base:${tag} - - docker pull "${AMD64_IMAGE_PATH}" - docker pull "${ARM64_IMAGE_PATH}" - docker pull "${PPC64LE_IMAGE_PATH}" - docker pull "${S390X_IMAGE_PATH}" - - docker manifest create "${IMAGE_PATH}" "${AMD64_IMAGE_PATH}" "${ARM64_IMAGE_PATH}" "${PPC64LE_IMAGE_PATH}" "${S390X_IMAGE_PATH}" - docker manifest annotate "${IMAGE_PATH}" "${AMD64_IMAGE_PATH}" --arch amd64 - docker manifest annotate "${IMAGE_PATH}" "${ARM64_IMAGE_PATH}" --arch arm64 - docker manifest annotate "${IMAGE_PATH}" "${PPC64LE_IMAGE_PATH}" --arch ppc64le - docker manifest annotate "${IMAGE_PATH}" "${S390X_IMAGE_PATH}" --arch s390x - - docker manifest inspect --verbose "${IMAGE_PATH}" - - docker manifest push "${IMAGE_PATH}" - done -) diff --git a/jobs/ci-run/scripts/snippet_setup_ecr_public.sh b/jobs/ci-run/scripts/snippet_setup_ecr_public.sh new file mode 100644 index 0000000..57f59c2 --- /dev/null +++ b/jobs/ci-run/scripts/snippet_setup_ecr_public.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -eux + +if ! [ -x "$(command -v aws)" ]; then + sudo snap install aws-cli --classic || true +fi + +if ! [ -x "$(command -v skopeo)" ]; then + sudo apt-get install skopeo +fi + +aws ecr-public create-repository --repository-name "build-${SHORT_GIT_COMMIT}/jujud-operator" || true +aws ecr-public create-repository --repository-name "build-${SHORT_GIT_COMMIT}/juju-db" || true +aws ecr-public create-repository --repository-name "build-${SHORT_GIT_COMMIT}/charm-base" || true + +aws ecr-public get-login-password | skopeo login -u AWS --password-stdin public.ecr.aws + +# use the latest skopeo for doing the actual copy. +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/juju-db:4.4 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/juju-db:4.4 +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-18.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-18.04 +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-20.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-20.04 +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-22.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-22.04 diff --git a/jobs/common/pre-reqs.yaml b/jobs/common/pre-reqs.yaml index c68436f..aff54ec 100644 --- a/jobs/common/pre-reqs.yaml +++ b/jobs/common/pre-reqs.yaml @@ -22,6 +22,23 @@ echo "Logging into Dockerhub with username ${DOCKERHUB_U}" echo "$DOCKERHUB_P" | docker login -u "$DOCKERHUB_U" --password-stdin +# docker-ecr-login will run the login steps for connecting this host's docker +# to the Juju ecr public account. +- builder: + name: docker-ecr-login + builders: + - host-src-command: + src_command: |- + #!/bin/bash + set -eu + set +x + + if ! [ -x "$(command -v aws)" ]; then + sudo snap install aws-cli --classic || true + fi + echo "Logging into public.ecr.aws with ECR credentials" + aws ecr-public get-login-password | docker login -u AWS --password-stdin public.ecr.aws + - builder: name: apt-install builders: diff --git a/jobs/common/s3builders.yaml b/jobs/common/s3builders.yaml index 4f3afba..ca9c8f3 100644 --- a/jobs/common/s3builders.yaml +++ b/jobs/common/s3builders.yaml @@ -335,3 +335,19 @@ set -e echo "Removing Juju source ${SHORT_GIT_COMMIT} buildvars file" rm -rf buildvars + + +- builder: + name: select-oci-registry + builders: + - shell: |- + #!/bin/bash + set -e + echo "OPERATOR_IMAGE_ACCOUNT=public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}" > juju-oci.properties + cat juju-oci.properties + - inject: + properties-file: juju-oci.properties + - shell: |- + #!/bin/bash + set -e + rm -rf juju-oci.properties diff --git a/tests/suites/static_analysis/lint_yaml.sh b/tests/suites/static_analysis/lint_yaml.sh index 264ff17..807a7e6 100644 --- a/tests/suites/static_analysis/lint_yaml.sh +++ b/tests/suites/static_analysis/lint_yaml.sh @@ -80,6 +80,7 @@ jobs: - gating-functional-tests-s390x - gating-functional-tests-ppc64el - test-refresh-multijob + - build-jujud-operator-test # TODO (stickupkid): The followng jobs seem to be orphan jobs with in the # jenkins suite. We should clean them up to ensure that they do run, or diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config index 47ed313..c08c9ff 100644 --- a/tools/gen-wire-tests/juju.config +++ b/tools/gen-wire-tests/juju.config @@ -20,6 +20,8 @@ folders: 3.3 test_controllercharm: 3.3 + test_prometheus: + 3.3 test_dashboard_deploy: 3.1 test_deploy_coslite: @@ -63,6 +65,8 @@ folders: ephemeral: - sidecar - smoke-aws + cross-cloud: + - controllercharm-lxd skip-all: - examples - ovs_maas @@ -85,6 +89,7 @@ folders: skip-aws: - bootstrap - caasadmission + - controllercharm - cli - constraints - coslite @@ -206,4 +211,5 @@ folders: - user - secrets_iaas skip-subtasks: + - test_pebble_change_updated - test_upgrade_simplestream_previous diff --git a/tools/gen-wire-tests/main.go b/tools/gen-wire-tests/main.go index fb2c688..9754d8d 100644 --- a/tools/gen-wire-tests/main.go +++ b/tools/gen-wire-tests/main.go @@ -29,6 +29,7 @@ type Config struct { SkipSubTasks []string `yaml:"skip-subtasks"` PreventSplit []string `yaml:"prevent-split"` Ephemeral []string `yaml:"ephemeral"` + CrossCloud []string `yaml:"cross-cloud"` Unstable map[string]map[string][]string `yaml:"unstable"` Timeout map[string]map[string]int `yaml:"timeout"` Introduced map[string]string `yaml:"introduced"` @@ -225,7 +226,7 @@ func isTrackingBranch(inputDir, trackingBranch string) bool { cmd = exec.Command("git", "-C", inputDir, "diff", "--quiet", fmt.Sprintf("upstream/%s", trackingBranch)) if err := cmd.Run(); err != nil { - log.Fatalf("unable to fetch: %v", err) + log.Fatalf("unable to diff: %v", err) } return true @@ -273,6 +274,11 @@ func writeJobDefinitions( ephemeral[test] = true } + crossCloud := make(map[string]bool) + for _, test := range config.Folders.CrossCloud { + crossCloud[test] = true + } + minVersions := make(map[string]string) for _, task := range task.SubTasks { if introduced, ok := config.Folders.Introduced[task]; ok { @@ -292,6 +298,7 @@ func writeJobDefinitions( UnstableTasks map[string][]string Unstable bool Ephemeral map[string]bool + CrossCloud map[string]bool Timeout map[string]int MinVersions map[string]string }{ @@ -303,6 +310,7 @@ func writeJobDefinitions( UnstableTasks: task.UnstableProviderSubTasks, Unstable: unstable, Ephemeral: ephemeral, + CrossCloud: crossCloud, Timeout: task.Timeout, MinVersions: minVersions, }); err != nil { @@ -473,7 +481,7 @@ const Template = ` {{- $builder = "run-integration-test" -}} {{- $run_on = "ephemeral-focal-8c-32g-amd64" -}} {{- end }} - {{- if eq $cloud.CloudName "microk8s" }} + {{- if or (eq (index $node.CrossCloud $test_name) true) (eq $cloud.CloudName "microk8s") }} {{- $builder = "run-integration-test-microk8s" -}} {{- $run_on = "ephemeral-focal-8c-32g-amd64" -}} {{- end }} @@ -540,10 +548,6 @@ const Template = ` 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: @@ -551,9 +555,7 @@ const Template = ` 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 {{- if or (index $.MinVersions $task_name) (index $.MinVersions (printf "%s-%s" $.SuiteName $task_name)) }}