Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[186049138] Pipelines do not need to run apk #3505

Merged
merged 1 commit into from
Dec 12, 2023
Merged

[186049138] Pipelines do not need to run apk #3505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions concourse/pipelines/autodelete-cloudfoundry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
inputs:
- name: paas-cf
params:
Expand All @@ -142,7 +142,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
run:
path: sh
args:
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
run:
path: ./paas-cf/concourse/scripts/rds_instances.sh
args:
Expand Down
56 changes: 25 additions & 31 deletions concourse/pipelines/create-cloudfoundry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,77 +11,77 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
psql: &psql-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/psql
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
node: &node-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/node
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
node-chromium: &node-chromium-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/node-chromium
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
awscli: &awscli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
concourse-tools: &concourse-tools-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/concourse-tools
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
cf-acceptance-tests: &cf-acceptance-tests-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
cf-cli: &cf-cli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
cf-uaac: &cf-uaac-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-uaac
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
git-ssh: &git-ssh-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/git-ssh
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
ruby-slim: &ruby-slim-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/ruby
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
golang: &golang-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/golang
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
terraform: &terraform-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
curl-ssl: &curl-ssl-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/curl-ssl
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036


tasks:
Expand Down Expand Up @@ -263,6 +263,7 @@ groups:
- rotate-prometheus-credentials
- expire-aws-keys
- rotate-cf-admin-password

resource_types:
# FIX ME: The server certificate verification fails when using the concourse
# version of the resource_type `git`. As a temporary fix we have docker image
Expand Down Expand Up @@ -827,7 +828,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: paas-cf
Expand Down Expand Up @@ -2965,7 +2966,7 @@ jobs:
CREDHUB_CLIENT_SECRET: ((bosh-credhub-admin))
CREDHUB_CA_CERT: ((bosh-credhub-ca-cert))
DEPLOY_ENV: ((deploy_env))
BOSH_EXPORTER_PASSWORD: ((bosh-exporter-password))
BOSH_EXPORTER_PASSWORD: ((bosh-exporter-password))
run:
path: sh
args:
Expand Down Expand Up @@ -3343,7 +3344,7 @@ jobs:
fi

for az in $(seq 1 $AZ_COUNT); do

# iterate through dashboards to remove.
for dashboard in "billing-slis" "billing-compared-to-spending"; do
echo "Removing ${dashboard} from grafana-${az}.${SYSTEM_DNS_ZONE_NAME}"
Expand Down Expand Up @@ -4419,7 +4420,6 @@ jobs:
- -e
- -c
- |
apk add --quiet --no-progress --no-cache g++ musl-dev make
uaac target "${UAA_API_URL}"
uaac token client get admin -s "${UAA_ADMIN_CLIENT_SECRET}"
CF_TOKEN="bearer $(uaac contexts | awk '$1 ~ /access_token/ {print $2}')"
Expand Down Expand Up @@ -4620,7 +4620,7 @@ jobs:
- *add-grafana-job-annotation
- in_parallel:
- get: pipeline-trigger
passed:
passed:
- post-cf-deploy
- prometheus-deploy
- app-autoscaler-deploy
Expand Down Expand Up @@ -4683,8 +4683,8 @@ jobs:

delete_unused_keys ses_smtp_aws_access_key_id "ses-smtp-${DEPLOY_ENV}"
delete_unused_keys metrics_exporter_aws_access_key_id "metrics-exporter-${DEPLOY_ENV}"
delete_unused_keys yace_aws_access_key_id "yace-${DEPLOY_ENV}"
delete_unused_keys yace_aws_access_key_id "yace-${DEPLOY_ENV}"

- *end-grafana-job-annotation

- name: smoke-tests
Expand Down Expand Up @@ -4817,7 +4817,7 @@ jobs:
trigger: true
- <<: *get-paas-cf
passed: *smoke-tests-resource-passed
- get: cf-manifest
- get: cf-manifest
- get: cf-acceptance-tests

- do:
Expand Down Expand Up @@ -5280,7 +5280,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/spruce
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: paas-cf
Expand Down Expand Up @@ -5488,12 +5488,6 @@ jobs:
cp "paas-cf/config/billing/output/${AWS_REGION}.json" ./src/github.com/alphagov/paas-billing/config.json
cp "paas-cf/config/billing/tests/${AWS_REGION}_billing_rds_charges.feature" ./src/github.com/alphagov/paas-billing/gherkin/features/

wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
echo "deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list

apt-get -q update
apt-get -q -y install postgresql-12 postgresql-client-12

cat > /etc/postgresql/12/main/pg_hba.conf <<-EOF
local all postgres trust
host all postgres 127.0.0.1/32 trust
Expand Down Expand Up @@ -6541,7 +6535,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-uaac
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: passwords
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/deployment-kick-off.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
inputs:
- name: paas-cf
- name: deployment-timer
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

run:
path: ./paas-cf/concourse/scripts/rds_instances.sh
Expand All @@ -86,7 +86,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: paas-cf
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: paas-cf
Expand Down
10 changes: 5 additions & 5 deletions concourse/pipelines/destroy-cloudfoundry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: paas-cf
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
inputs:
- name: paas-cf
- name: config
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: bosh-vars-store
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/ruby
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
inputs:
- name: paas-cf
- name: cf-tfstate
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: terraform-variables
Expand Down
6 changes: 3 additions & 3 deletions concourse/pipelines/fast-startup-and-shutdown-cf-env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
inputs:
- name: paas-cf
params:
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
run:
path: bash
args:
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
run:
path: bash
args:
Expand Down
2 changes: 1 addition & 1 deletion concourse/pipelines/monitor-remote.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

inputs:
- name: paas-cf
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/test-certificate-rotation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

cf-acceptance-tests: &cf-acceptance-tests-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036

cf-cli: &cf-cli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036


resource_types:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/aiven-broker-acceptance-tests-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
inputs:
- name: paas-cf
- name: test-config
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/app-autoscaler-acceptance-tests-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
inputs:
- name: paas-cf
- name: admin-creds
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/check-az-is-enabled-in-manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: c95d8a764a2784fd2707ac631ecc27ad66cd2c03
tag: 9d7b91294e91172c6f2d63caae4c7b645fc46036
params:
DEPLOY_ENV:
BOSH_ENVIRONMENT:
Expand Down
Loading