From 2e65689143089192ffb0a10cb77fbf2ee7079e78 Mon Sep 17 00:00:00 2001 From: rjanakiraman Date: Fri, 22 Aug 2025 14:09:40 +0530 Subject: [PATCH 1/2] add dev release test --- ci/dockerfiles/Dockerfile.ci | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/dockerfiles/Dockerfile.ci b/ci/dockerfiles/Dockerfile.ci index 336917d9..ddf4afba 100644 --- a/ci/dockerfiles/Dockerfile.ci +++ b/ci/dockerfiles/Dockerfile.ci @@ -40,7 +40,8 @@ RUN chmod +x ./yj && \ mv ./yj /usr/bin/yj # install om -RUN wget $(curl -s https://api.github.com/repos/pivotal-cf/om/releases/latest | jq -r '.assets[] | select(.name? | match("om-linux-amd64-\\d+.\\d+.\\d+$")) | .browser_download_url') -O om +# temp patch for testing... +RUN wget $(curl -s https://api.github.com/repos/pivotal-cf/om/releases/241452066 | jq -r '.assets[] | select(.name? | match("om-linux-amd64-bin")) | .browser_download_url') -O om RUN chmod +x ./om && \ mv ./om /usr/bin/om From e4212e94c689bcb99a09d675df0c6ee4fb9db9cc Mon Sep 17 00:00:00 2001 From: rjanakiraman Date: Mon, 25 Aug 2025 10:05:12 +0530 Subject: [PATCH 2/2] fix google cloud and azure cli version --- ci/ci/pipeline.yml | 7 ++++--- ci/dockerfiles/Dockerfile.ci | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ci/ci/pipeline.yml b/ci/ci/pipeline.yml index 1969018d..93ff588a 100644 --- a/ci/ci/pipeline.yml +++ b/ci/ci/pipeline.yml @@ -53,7 +53,7 @@ resources: - name: docs-platform-automation type: git source: - branch: develop + branch: fix-ci-aws-azure private_key: ((platform-automation/main/platform_automation_docs.private_key)) uri: git@github.com:pivotal/docs-platform-automation ignore_paths: @@ -110,7 +110,7 @@ resources: source: password: ((concourse-team/dev_image_registry.password)) repository: ((concourse-team/dev_image_registry.dev_url))/internalpcfplatformautomation/platform-automation - tag: testing + tag: fix-ci-aws-azure username: ((concourse-team/dev_image_registry.username)) - name: vsphere-only-image type: registry-image @@ -552,10 +552,11 @@ jobs: globs: - '*linux' - get: om-release + version: { tag: 'testtag' } trigger: true params: globs: - - 'om-linux-amd64-*[^.tar.gz]' + - 'om-linux-amd64*[^.tar.gz]' - get: docs-platform-automation trigger: false - get: packages-image diff --git a/ci/dockerfiles/Dockerfile.ci b/ci/dockerfiles/Dockerfile.ci index ddf4afba..7c5b392b 100644 --- a/ci/dockerfiles/Dockerfile.ci +++ b/ci/dockerfiles/Dockerfile.ci @@ -67,10 +67,11 @@ RUN wget https://github.com/vmware/govmomi/releases/latest/download/govc_Linux_x RUN apt install -y python3-openstackclient # add keys for gcloud and azure -RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" | tee /etc/apt/sources.list.d/google-cloud-sdk.list -RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - -RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ jammy main" | tee /etc/apt/sources.list.d/azure-cli.list -RUN curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - +RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg +RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee /etc/apt/sources.list.d/google-cloud-sdk.list +RUN curl -sLS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg && \ + chmod go+r /etc/apt/keyrings/microsoft.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ jammy main" | tee /etc/apt/sources.list.d/azure-cli.list RUN apt -y update # install gcloud and azure