Skip to content

Commit aa5c95a

Browse files
pyalexpyalex
committed
backport Shift js protos (#1344)
Signed-off-by: Oleksii Moskalenko <moskalenko.alexey@gmail.com>
1 parent 8449555 commit aa5c95a

3 files changed

Lines changed: 11 additions & 160 deletions

File tree

‎.prow/config.yaml‎

Lines changed: 1 addition & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -195,165 +195,6 @@ presubmits:
195195
secret:
196196
secretName: feast-service-account
197197

198-
- name: test-end-to-end
199-
decorate: true
200-
always_run: true
201-
spec:
202-
containers:
203-
- image: gcr.io/kf-feast/feast-ci:latest
204-
command: ["infra/scripts/test-end-to-end.sh"]
205-
resources:
206-
requests:
207-
cpu: "6"
208-
memory: "6144Mi"
209-
env:
210-
- name: GOOGLE_APPLICATION_CREDENTIALS
211-
value: /etc/gcloud/service-account.json
212-
volumeMounts:
213-
- mountPath: /etc/gcloud/service-account.json
214-
name: service-account
215-
readOnly: true
216-
subPath: service-account.json
217-
volumes:
218-
- name: service-account
219-
secret:
220-
secretName: feast-service-account
221-
222-
- name: test-end-to-end-gcp
223-
decorate: true
224-
always_run: true
225-
max_concurrency: 1
226-
spec:
227-
containers:
228-
- image: gcr.io/kf-feast/feast-ci:latest
229-
command: [ "infra/scripts/test-end-to-end-gcp.sh" ]
230-
resources:
231-
requests:
232-
cpu: "6"
233-
memory: "6144Mi"
234-
env:
235-
- name: GOOGLE_APPLICATION_CREDENTIALS
236-
value: /etc/gcloud/service-account.json
237-
volumeMounts:
238-
- mountPath: /etc/gcloud/service-account.json
239-
name: service-account
240-
readOnly: true
241-
subPath: service-account.json
242-
volumes:
243-
- name: service-account
244-
secret:
245-
secretName: feast-service-account
246-
247-
248-
- name: test-end-to-end-aws
249-
decorate: true
250-
always_run: true
251-
max_concurrency: 1
252-
spec:
253-
containers:
254-
- image: gcr.io/kf-feast/feast-ci:latest
255-
command: [ "infra/scripts/codebuild_runner.py", "--location-from-prow", "--project-name", "feast-ci-project" ]
256-
resources:
257-
requests:
258-
cpu: "2"
259-
memory: "2048Mi"
260-
env:
261-
- name: AWS_ACCESS_KEY_ID
262-
valueFrom:
263-
secretKeyRef:
264-
name: feast-aws-creds
265-
key: AWS_ACCESS_KEY_ID
266-
- name: AWS_SECRET_ACCESS_KEY
267-
valueFrom:
268-
secretKeyRef:
269-
name: feast-aws-creds
270-
key: AWS_SECRET_ACCESS_KEY
271-
- name: AWS_DEFAULT_REGION
272-
value: us-west-2
273-
- name: test-end-to-end-sparkop
274-
decorate: true
275-
always_run: true
276-
max_concurrency: 1
277-
spec:
278-
containers:
279-
- image: gcr.io/kf-feast/feast-ci:latest
280-
command: [ "infra/scripts/codebuild_runner.py", "--location-from-prow", "--project-name", "feast-ci-sparkop-project" ]
281-
resources:
282-
requests:
283-
cpu: "2"
284-
memory: "2048Mi"
285-
env:
286-
- name: AWS_ACCESS_KEY_ID
287-
valueFrom:
288-
secretKeyRef:
289-
name: feast-aws-creds
290-
key: AWS_ACCESS_KEY_ID
291-
- name: AWS_SECRET_ACCESS_KEY
292-
valueFrom:
293-
secretKeyRef:
294-
name: feast-aws-creds
295-
key: AWS_SECRET_ACCESS_KEY
296-
- name: AWS_DEFAULT_REGION
297-
value: us-west-2
298-
299-
- name: test-end-to-end-azure
300-
decorate: true
301-
always_run: true
302-
max_concurrency: 1
303-
spec:
304-
containers:
305-
- image: gcr.io/kf-feast/feast-ci:develop
306-
command: [ "infra/scripts/azure-runner.sh" ]
307-
resources:
308-
requests:
309-
cpu: "2"
310-
memory: "2048Mi"
311-
env:
312-
- name: GOOGLE_APPLICATION_CREDENTIALS
313-
value: /etc/gcloud/service-account.json
314-
- name: RESOURCE_GROUP
315-
value: Feast
316-
- name: AKS_CLUSTER_NAME
317-
value: main
318-
- name: DOCKER_REPOSITORY
319-
value: gcr.io/kf-feast
320-
- name: STAGING_PATH
321-
value: wasbs://staging@feastcicd.blob.core.windows.net/cicd-staging
322-
- name: AZ_SERVICE_PRINCIPAL_ID
323-
valueFrom:
324-
secretKeyRef:
325-
name: feast-az-creds
326-
key: AZ_SERVICE_PRINCIPAL_ID
327-
- name: AZ_SERVICE_PRINCIPAL_PASS
328-
valueFrom:
329-
secretKeyRef:
330-
name: feast-az-creds
331-
key: AZ_SERVICE_PRINCIPAL_PASS
332-
- name: AZ_SERVICE_PRINCIPAL_TENANT_ID
333-
valueFrom:
334-
secretKeyRef:
335-
name: feast-az-creds
336-
key: AZ_SERVICE_PRINCIPAL_TENANT_ID
337-
- name: AZURE_BLOB_ACCOUNT_NAME
338-
valueFrom:
339-
secretKeyRef:
340-
name: feast-az-creds
341-
key: AZURE_BLOB_ACCOUNT_NAME
342-
- name: AZURE_BLOB_ACCOUNT_ACCESS_KEY
343-
valueFrom:
344-
secretKeyRef:
345-
name: feast-az-creds
346-
key: AZURE_BLOB_ACCOUNT_ACCESS_KEY
347-
volumeMounts:
348-
- mountPath: /etc/gcloud/service-account.json
349-
name: service-account
350-
readOnly: true
351-
subPath: service-account.json
352-
volumes:
353-
- name: service-account
354-
secret:
355-
secretName: feast-service-account
356-
357198
postsubmits:
358199
feast-dev/feast:
359200
- name: publish-python-sdk
@@ -365,7 +206,7 @@ postsubmits:
365206
- sh
366207
- -c
367208
- |
368-
make compile-protos-python && infra/scripts/publish-python-sdk.sh \
209+
make package-protos && make compile-protos-python && infra/scripts/publish-python-sdk.sh \
369210
--directory-path sdk/python --repository pypi
370211
volumeMounts:
371212
- name: pypirc

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ build-java-no-tests:
6464
install-python-ci-dependencies:
6565
pip install --no-cache-dir -r sdk/python/requirements-ci.txt
6666

67+
package-protos:
68+
cp -r ${ROOT_DIR}/protos ${ROOT_DIR}/sdk/python/feast/protos
69+
6770
compile-protos-python: install-python-ci-dependencies
6871
@$(foreach dir,$(PROTO_TYPE_SUBDIRS),cd ${ROOT_DIR}/protos; python -m grpc_tools.protoc -I. --python_out=../sdk/python/ --mypy_out=../sdk/python/ feast/$(dir)/*.proto;)
6972
@$(foreach dir,$(PROTO_SERVICE_SUBDIRS),cd ${ROOT_DIR}/protos; python -m grpc_tools.protoc -I. --grpc_python_out=../sdk/python/ feast/$(dir)/*.proto;)

‎sdk/python/setup.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,11 @@
9494
entry_points={"console_scripts": ["feast=feast.cli:cli"]},
9595
use_scm_version={"root": "../..", "relative_to": __file__, "tag_regex": TAG_REGEX},
9696
setup_requires=["setuptools_scm"],
97+
package_data={
98+
"": [
99+
"protos/feast/**/*.proto",
100+
"protos/feast/third_party/grpc/health/v1/*.proto",
101+
"protos/tensorflow_metadata/proto/v0/*.proto",
102+
],
103+
},
97104
)

0 commit comments

Comments
 (0)