diff --git a/.tekton/tasks/deploy-cluster.yaml b/.tekton/tasks/deploy-cluster.yaml index c45d670ae..79a55bc79 100644 --- a/.tekton/tasks/deploy-cluster.yaml +++ b/.tekton/tasks/deploy-cluster.yaml @@ -10,7 +10,7 @@ spec: default: "4.14" - name: region description: ocp cluster region where you want to provision - default: "us-east-1" + default: "ca-central-1" - name: cluster-name - name: target_branch workspaces: diff --git a/.tekton/tasks/destroy-cluster.yaml b/.tekton/tasks/destroy-cluster.yaml index 0e771ea0e..54e34f7bf 100644 --- a/.tekton/tasks/destroy-cluster.yaml +++ b/.tekton/tasks/destroy-cluster.yaml @@ -8,7 +8,7 @@ spec: - name: cluster-name - name: region description: ocp cluster region where you want to provision - default: "us-east-1" + default: "ca-central-1" - name: target_branch workspaces: - name: workdir diff --git a/.tekton/tasks/destroy-existing-cluster.yaml b/.tekton/tasks/destroy-existing-cluster.yaml index 2b6022658..5d70b0c7a 100644 --- a/.tekton/tasks/destroy-existing-cluster.yaml +++ b/.tekton/tasks/destroy-existing-cluster.yaml @@ -8,7 +8,7 @@ spec: - name: target_branch - name: region description: ocp cluster region where you want to provision - default: us-east-1 + default: ca-central-1 workspaces: - name: workdir steps: diff --git a/ci/images/ci-runner/Dockerfile b/ci/images/ci-runner/Dockerfile index 54aa8ed85..62c9c8610 100644 --- a/ci/images/ci-runner/Dockerfile +++ b/ci/images/ci-runner/Dockerfile @@ -5,7 +5,7 @@ RUN set -x \ && mkdir -p /tmp/image-build \ && microdnf install -y \ gettext-0.21 \ - git-2.43.0 \ + git-2.43.5 \ findutils-1:4.8.0 \ openssl-1:3.0.7 \ podman-4:4.9.4 \ diff --git a/ci/images/ci-runner/hack/bin/deploy-cluster.sh b/ci/images/ci-runner/hack/bin/deploy-cluster.sh index 73ece98f0..4a9a7ed41 100755 --- a/ci/images/ci-runner/hack/bin/deploy-cluster.sh +++ b/ci/images/ci-runner/hack/bin/deploy-cluster.sh @@ -8,12 +8,12 @@ SCRIPT_DIR="$( pwd )" -AWS_OIDC_CONFIG_ID="273tbj71skqksgqafoe5aotsuc44blp4" -OPERATOR_ROLES_PREFIX="plnsvc-ci-10-2023" -SUBNET_IDS="subnet-001487732ebdd14f4,subnet-0718fb663f4b97f38,subnet-0fe426997da62662c" -INSTALL_ROLE_ARN="arn:aws:iam::400884778152:role/plnsvc-ci-10-2023-HCP-ROSA-Installer-Role" -SUPPORT_ROLE_ARN="arn:aws:iam::400884778152:role/plnsvc-ci-10-2023-HCP-ROSA-Support-Role" -WORKER_ROLE_ARN="arn:aws:iam::400884778152:role/plnsvc-ci-10-2023-HCP-ROSA-Worker-Role" +AWS_OIDC_CONFIG_ID="2c8kdm2m2r8hlgdq4md7ps5g4csuecjl" +OPERATOR_ROLES_PREFIX="plnsvc" +SUBNET_IDS="subnet-028942fe6e2de3c82,subnet-098b75cd7032940ae" +INSTALL_ROLE_ARN="arn:aws:iam::400884778152:role/plnsvc-HCP-ROSA-Installer-Role" +SUPPORT_ROLE_ARN="arn:aws:iam::400884778152:role/plnsvc-HCP-ROSA-Support-Role" +WORKER_ROLE_ARN="arn:aws:iam::400884778152:role/plnsvc-HCP-ROSA-Worker-Role" # shellcheck source=ci/images/ci-runner/hack/bin/utils.sh source "$SCRIPT_DIR/utils.sh" diff --git a/ci/images/e2e-test-runner/Dockerfile b/ci/images/e2e-test-runner/Dockerfile index 1959c0363..44a33f66c 100644 --- a/ci/images/e2e-test-runner/Dockerfile +++ b/ci/images/e2e-test-runner/Dockerfile @@ -5,7 +5,7 @@ RUN set -x \ && mkdir -p /tmp/image-build \ && microdnf install -y \ httpd-tools \ - git-2.43.0 \ + git-2.43.5 \ make-1:4.3 \ openssl-1:3.0.7 \ tar-2:1.34 \ diff --git a/developer/images/dependencies-update/Dockerfile b/developer/images/dependencies-update/Dockerfile index b906261cb..ed1a6bd69 100644 --- a/developer/images/dependencies-update/Dockerfile +++ b/developer/images/dependencies-update/Dockerfile @@ -21,7 +21,7 @@ ENV HOME /tmp/home RUN mkdir $HOME && chmod 777 $HOME && chown 65532:65532 $HOME RUN microdnf install -y \ findutils-1:4.8.0 \ - git-2.43.0 \ + git-2.43.5 \ skopeo-2:1.14.3 \ && microdnf clean all