Skip to content

Commit c882555

Browse files
authored
Adjust release process after quickstart changes (#4104)
* Adjust release process after quickstart changes * Remove more quickstart CI code
1 parent 7b88d3d commit c882555

File tree

8 files changed

+16
-458
lines changed

8 files changed

+16
-458
lines changed

.github/workflows/release_prepare.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ jobs:
100100
fi
101101
done
102102
git add examples/quickstart
103-
- name: Regenerate quickstart cloud requirements
104-
run: |
105-
scripts/generate_cloud_requirements.sh --zenml-version "${{ needs.fetch-versions.outputs.new_version }}"
106-
git add examples/quickstart/requirements_*.txt
107103
# Generate and append release notes
108104
- name: Generate release notes
109105
# Only run this part once when the release branch is created
@@ -231,11 +227,8 @@ jobs:
231227
matrix:
232228
include:
233229
- cloud: aws
234-
parent_image: 715803424590.dkr.ecr.eu-central-1.amazonaws.com/prepare-release:quickstart-aws
235230
- cloud: azure
236-
parent_image: zenmldocker/prepare-release:quickstart-azure
237231
- cloud: gcp
238-
parent_image: zenmldocker/prepare-release:quickstart-gcp
239232
steps:
240233
# Check out the code
241234
- name: Checkout code
@@ -253,6 +246,4 @@ jobs:
253246
run: |
254247
scripts/qs_run_release_flow.sh \
255248
--cloud "${{ matrix.cloud }}" \
256-
--parent-image "${{ matrix.parent_image }}" \
257-
--new-version "${{ needs.fetch-versions.outputs.new_version }}" \
258-
--branch-ref "${{ github.ref }}"
249+
--new-version "${{ needs.fetch-versions.outputs.new_version }}"

docker/zenml-quickstart-dev.Dockerfile

Lines changed: 0 additions & 26 deletions
This file was deleted.

docker/zenml-quickstart.Dockerfile

Lines changed: 0 additions & 29 deletions
This file was deleted.

examples/quickstart/pipelines/simple_pipeline.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
from steps.simple_step import simple_step
66

77
from zenml import pipeline
8-
from zenml.config import CORSConfig, DeploymentSettings, DockerSettings
9-
10-
docker_settings = DockerSettings(
11-
requirements="requirements.txt",
12-
)
8+
from zenml.config import CORSConfig, DeploymentSettings
139

1410
deployment_settings = DeploymentSettings(
1511
app_title="Simple Pipeline",
@@ -19,7 +15,6 @@
1915

2016
@pipeline(
2117
settings={
22-
"docker": docker_settings,
2318
"deployment": deployment_settings,
2419
},
2520
enable_cache=False,

release-cloudbuild-preparation.yaml

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,6 @@ steps:
1010
- USERNAME
1111
- PASSWORD
1212

13-
# Build base image
14-
- name: gcr.io/cloud-builders/docker
15-
args:
16-
- '-c'
17-
- |
18-
docker build . \
19-
--platform linux/amd64 \
20-
-f docker/zenml-dev.Dockerfile \
21-
-t $$USERNAME/prepare-release:base-${_ZENML_NEW_VERSION}
22-
23-
id: build-base
24-
waitFor: ['-']
25-
entrypoint: bash
26-
secretEnv:
27-
- USERNAME
28-
29-
# Push base image
30-
- name: gcr.io/cloud-builders/docker
31-
args:
32-
- '-c'
33-
- docker push $$USERNAME/prepare-release:base-${_ZENML_NEW_VERSION}
34-
id: push-base
35-
waitFor:
36-
- docker-login
37-
- build-base
38-
entrypoint: bash
39-
secretEnv:
40-
- USERNAME
41-
4213
# Build server image
4314
- name: gcr.io/cloud-builders/docker
4415
args:
@@ -68,82 +39,6 @@ steps:
6839
secretEnv:
6940
- USERNAME
7041

71-
# Build Quickstart GCP Image
72-
- name: gcr.io/cloud-builders/docker
73-
args:
74-
- '-c'
75-
- |
76-
docker build . \
77-
--platform linux/amd64 \
78-
--build-arg BASE_IMAGE=$$USERNAME/prepare-release:base-${_ZENML_NEW_VERSION} \
79-
--build-arg CLOUD_PROVIDER=gcp \
80-
--build-arg ZENML_BRANCH=${_ZENML_BRANCH} \
81-
-f docker/zenml-quickstart-dev.Dockerfile \
82-
-t $$USERNAME/prepare-release:quickstart-gcp-${_ZENML_NEW_VERSION}
83-
84-
id: build-quickstart-gcp
85-
waitFor:
86-
- push-base
87-
entrypoint: bash
88-
secretEnv:
89-
- USERNAME
90-
91-
# Build Quickstart AWS image
92-
- name: gcr.io/cloud-builders/docker
93-
args:
94-
- '-c'
95-
- |
96-
docker build . \
97-
--platform linux/amd64 \
98-
--build-arg BASE_IMAGE=$$USERNAME/prepare-release:base-${_ZENML_NEW_VERSION} \
99-
--build-arg CLOUD_PROVIDER=aws \
100-
--build-arg ZENML_BRANCH=${_ZENML_BRANCH} \
101-
-f docker/zenml-quickstart-dev.Dockerfile \
102-
-t $$USERNAME/prepare-release:quickstart-aws-${_ZENML_NEW_VERSION}
103-
id: build-quickstart-aws
104-
waitFor:
105-
- push-base
106-
entrypoint: bash
107-
secretEnv:
108-
- USERNAME
109-
110-
# Build Quickstart Azure image
111-
- name: gcr.io/cloud-builders/docker
112-
args:
113-
- '-c'
114-
- |
115-
docker build . \
116-
--platform linux/amd64 \
117-
--build-arg BASE_IMAGE=$$USERNAME/prepare-release:base-${_ZENML_NEW_VERSION} \
118-
--build-arg CLOUD_PROVIDER=azure \
119-
--build-arg ZENML_BRANCH=${_ZENML_BRANCH} \
120-
-f docker/zenml-quickstart-dev.Dockerfile \
121-
-t $$USERNAME/prepare-release:quickstart-azure-${_ZENML_NEW_VERSION}
122-
id: build-quickstart-azure
123-
waitFor:
124-
- push-base
125-
entrypoint: bash
126-
secretEnv:
127-
- USERNAME
128-
129-
# Push Quickstart images
130-
- name: gcr.io/cloud-builders/docker
131-
args:
132-
- '-c'
133-
- |
134-
docker push $$USERNAME/prepare-release:quickstart-aws-${_ZENML_NEW_VERSION}
135-
docker push $$USERNAME/prepare-release:quickstart-azure-${_ZENML_NEW_VERSION}
136-
docker push $$USERNAME/prepare-release:quickstart-gcp-${_ZENML_NEW_VERSION}
137-
id: push-quickstart
138-
waitFor:
139-
- docker-login
140-
- build-quickstart-gcp
141-
- build-quickstart-aws
142-
- build-quickstart-azure
143-
entrypoint: bash
144-
secretEnv:
145-
- USERNAME
146-
14742
timeout: 3600s
14843
availableSecrets:
14944
secretManager:

release-cloudbuild.yaml

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -156,75 +156,6 @@ steps:
156156
secretEnv:
157157
- USERNAME
158158

159-
# build client quickstart gcp image - python 3.11
160-
- name: gcr.io/cloud-builders/docker
161-
args:
162-
- '-c'
163-
- |
164-
docker buildx build \
165-
--platform linux/amd64 \
166-
--build-arg ZENML_VERSION=$TAG_NAME \
167-
--build-arg PYTHON_VERSION=3.11 \
168-
--build-arg CLOUD_PROVIDER=gcp \
169-
-f docker/zenml-quickstart.Dockerfile . \
170-
-t $$USERNAME/zenml-public-pipelines:quickstart-$TAG_NAME-py3.11-gcp
171-
id: build-quickstart-3.11-gcp
172-
waitFor: [ 'push-base' ]
173-
entrypoint: bash
174-
secretEnv:
175-
- USERNAME
176-
177-
# build client quickstart aws image - python 3.11
178-
- name: gcr.io/cloud-builders/docker
179-
args:
180-
- '-c'
181-
- |
182-
docker buildx build \
183-
--platform linux/amd64 \
184-
--build-arg ZENML_VERSION=$TAG_NAME \
185-
--build-arg PYTHON_VERSION=3.11 \
186-
--build-arg CLOUD_PROVIDER=aws \
187-
-f docker/zenml-quickstart.Dockerfile . \
188-
-t $$USERNAME/zenml-public-pipelines:quickstart-$TAG_NAME-py3.11-aws
189-
id: build-quickstart-3.11-aws
190-
waitFor: [ 'push-base' ]
191-
entrypoint: bash
192-
secretEnv:
193-
- USERNAME
194-
195-
# build client quickstart azure image - python 3.11
196-
- name: gcr.io/cloud-builders/docker
197-
args:
198-
- '-c'
199-
- |
200-
docker buildx build \
201-
--platform linux/amd64 \
202-
--build-arg ZENML_VERSION=$TAG_NAME \
203-
--build-arg PYTHON_VERSION=3.11 \
204-
--build-arg CLOUD_PROVIDER=azure \
205-
-f docker/zenml-quickstart.Dockerfile . \
206-
-t $$USERNAME/zenml-public-pipelines:quickstart-$TAG_NAME-py3.11-azure
207-
id: build-quickstart-3.11-azure
208-
waitFor: [ 'push-base' ]
209-
entrypoint: bash
210-
secretEnv:
211-
- USERNAME
212-
213-
# push quickstart images
214-
- name: gcr.io/cloud-builders/docker
215-
args:
216-
- '-c'
217-
- docker push --all-tags $$USERNAME/zenml-public-pipelines
218-
id: push-quickstart
219-
waitFor:
220-
- build-quickstart-3.11-gcp
221-
- build-quickstart-3.11-aws
222-
- build-quickstart-3.11-azure
223-
- docker-login
224-
entrypoint: bash
225-
secretEnv:
226-
- USERNAME
227-
228159
timeout: 3600s
229160
availableSecrets:
230161
secretManager:

0 commit comments

Comments
 (0)