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

Use registry-image in concourse pipelines #1553

Merged
merged 3 commits into from
Oct 31, 2022
+31 −31
Merged

Use registry-image in concourse pipelines #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b5ee0f
name offline site zip with short_id instead of name
gumaerc Oct 25, 2022
60eafac
Updating pipeline definitions for concourse with registry-image
pt2302 Oct 28, 2022
1565475
Merge remote-tracking branch 'origin/master' into pt/concourse_pipeli…
pt2302 Oct 28, 2022
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
18 changes: 9 additions & 9 deletions content_sync/pipelines/definitions/concourse/mass-build-sites.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
resource_types:
- name: http-resource
type: docker-image
type: registry-image
source:
repository: jgriff/http-resource
tag: latest
- name: s3-resource-iam
type: docker-image
type: registry-image
source:
repository: governmentpaas/s3-resource
tag: latest
Expand Down Expand Up @@ -37,7 +37,7 @@ resources:
task-config: &webhook-config
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: curlimages/curl}
# END ONLINE-ONLY
jobs:
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: mitodl/ocw-course-publisher, tag: 0.3}
inputs:
- name: ocw-hugo-themes
Expand All @@ -91,7 +91,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: bash, tag: latest}
outputs:
- name: publishable_sites
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: mitodl/ocw-course-publisher, tag: 0.3}
inputs:
- name: publishable_sites
Expand All @@ -140,7 +140,7 @@ jobs:
if [[ "$GIT_KEY" != "" ]]
then
echo $GIT_KEY > $CURDIR/git.key
sed -i -E "s/(-----BEGIN[^-]+-----)(.+)(-----END[^-]+-----)/-----BEGINSSHKEY-----\2\-----ENDSSHKEY-----/" git.key
sed -i -E "s/(-----BEGIN[^-]+-----)(.+)(-----END[^-]+-----)/-----BEGINSSHKEY-----\2\-----ENDSSHKEY-----/" git.key
sed -i -E "s/\s/\n/g" git.key
sed -i -E "s/SSHKEY/ OPENSSH PRIVATE KEY/g" git.key
chmod 400 $CURDIR/git.key
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: curlimages/curl}
run:
path: curl
Expand All @@ -285,4 +285,4 @@ jobs:
- 'Fastly-Soft-Purge: 1'
- https://api.fastly.com/service/((fastly_((version)).service_id))/purge_all
# END NON-DEV
# END ONLINE-ONLY
# END ONLINE-ONLY
14 changes: 7 additions & 7 deletions content_sync/pipelines/definitions/concourse/remove-unpublished-sites.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
---
resource_types:
- name: http-resource
type: docker-image
type: registry-image
source:
repository: jgriff/http-resource
tag: latest
- name: s3-resource-iam
type: docker-image
type: registry-image
source:
repository: governmentpaas/s3-resource
tag: latest
task-config: &webhook-config
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: curlimages/curl}
jobs:
- name: remove-unpublished-sites
Expand All @@ -25,7 +25,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: bash, tag: latest}
outputs:
- name: unpublishable_sites
Expand All @@ -51,7 +51,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: curlimages/curl}
run:
path: curl
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: amazon/aws-cli, tag: latest}
run:
path: sh
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: curlimages/curl}
run:
path: curl
Expand Down
20 changes: 10 additions & 10 deletions content_sync/pipelines/definitions/concourse/site-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
---
resource_types:
- name: http-resource
type: docker-image
type: registry-image
source:
repository: jgriff/http-resource
tag: latest
- name: s3-resource-iam
type: docker-image
type: registry-image
source:
repository: governmentpaas/s3-resource
tag: latest
# START NON-DEV
- name: slack-alert
type: docker-image
type: registry-image
source:
repository: arbourd/concourse-slack-alert-resource
tag: v0.15.0
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
"version": "((pipeline_name))",
"status": "errored"
}
# START NON-DEV
# START NON-DEV
- put: slack-webhook
timeout: 1m
params:
Expand All @@ -119,7 +119,7 @@ jobs:
"version": "((pipeline_name))",
"status": "errored"
}
# START NON-DEV
# START NON-DEV
- put: slack-webhook
timeout: 1m
params:
Expand All @@ -137,7 +137,7 @@ jobs:
"version": "((pipeline_name))",
"status": "aborted"
}
# START NON-DEV
# START NON-DEV
- put: slack-webhook
timeout: 1m
params:
Expand Down Expand Up @@ -333,7 +333,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: mitodl/ocw-course-publisher, tag: 0.3}
inputs:
- name: ocw-hugo-themes
Expand Down Expand Up @@ -419,14 +419,14 @@ jobs:
- name: course-markdown
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: amazon/aws-cli, tag: latest}
run:
path: sh
args:
- -exc
- |
aws s3((cli-endpoint-url)) sync s3://((ocw-studio-bucket))/((s3-path)) s3://((ocw-bucket))/((site-url)) --metadata site-id=((site-name))
aws s3((cli-endpoint-url)) sync s3://((ocw-studio-bucket))/((s3-path)) s3://((ocw-bucket))/((site-url)) --metadata site-id=((site-name))
aws s3((cli-endpoint-url)) sync course-markdown/public s3://((ocw-bucket))/((base-url)) --metadata site-id=((site-name))
# START DEV-ONLY
on_success:
Expand Down Expand Up @@ -506,7 +506,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: curlimages/curl}
run:
path: curl
Expand Down
10 changes: 5 additions & 5 deletions content_sync/pipelines/definitions/concourse/theme-assets-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: mitodl/ocw-course-publisher, tag: 0.3}
inputs:
- name: ocw-hugo-themes
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
AWS_SECRET_ACCESS_KEY: ((minio-root-password))
# END DEV-ONLY
image_resource:
type: docker-image
type: registry-image
source: {repository: amazon/aws-cli, tag: latest}
run:
path: sh
Expand All @@ -64,7 +64,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: curlimages/curl}
run:
path: curl
Expand All @@ -81,7 +81,7 @@ jobs:
config:
platform: linux
image_resource:
type: docker-image
type: registry-image
source: {repository: curlimages/curl}
run:
path: curl
Expand All @@ -92,4 +92,4 @@ jobs:
- -H
- 'Fastly-Key: ((fastly_live.api_token))'((purge_header))
- https://api.fastly.com/service/((fastly_live.service_id))/purge/ocw-hugo-themes
# END NON-DEV
# END NON-DEV