Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ci/ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [email protected]:pivotal/docs-platform-automation
ignore_paths:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions ci/dockerfiles/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -66,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
Expand Down