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.

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

[Fix] Cluster mode avro library location for java templates #979

Closed
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
139 changes: 0 additions & 139 deletions .cloudbuild/build_binaries.yaml

This file was deleted.

40 changes: 0 additions & 40 deletions .cloudbuild/promote_java_binaries.yaml

This file was deleted.

76 changes: 76 additions & 0 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

steps:
- name: gcr.io/cloud-builders/git
args:
- clone
- 'https://github.com/GoogleCloudPlatform/${_REPO}.git'
id: check-out-source-code
- name: python
args:
- python
- setup.py
- bdist_egg
- '--output=${_BINARY_PREFIX}.egg'
dir: '${_REPO}/python'
id: build-python-egg
- name: gcr.io/cloud-builders/gsutil
entrypoint: 'bash'
args:
- '-c'
- |
gsutil cp ${_REPO}/python/main.py gs://${_PUBLIC_BUCKET}/$(date -u +%Y-%m-%d)_$TAG_NAME/python/
id: cp-python-main-to-gcs-tag-folder
- name: gcr.io/cloud-builders/gsutil
args:
- cp
- main.py
- 'gs://${_PUBLIC_BUCKET}/latest/python/'
dir: '${_REPO}/python'
id: cp-python-main-to-gcs-latest-folder
- name: gcr.io/cloud-builders/gsutil
entrypoint: 'bash'
args:
- '-c'
- |
gsutil cp ${_REPO}/python/${_BINARY_PREFIX}.egg gs://${_PUBLIC_BUCKET}/$(date -u +%Y-%m-%d)_$TAG_NAME/python/
id: cp-python-egg-to-gcs-tag-folder
- name: gcr.io/cloud-builders/gsutil
args:
- cp
- '${_BINARY_PREFIX}.egg'
- 'gs://${_PUBLIC_BUCKET}/latest/python/'
dir: '${_REPO}/python'
id: cp-python-egg-to-gcs-latest-folder
- name: 'gcr.io/cloud-builders/mvn:3.5.0-jdk-8'
args:
- package
- '-Dmaven.test.skip=true'
dir: '${_REPO}/java'
id: build-java-jar
- name: gcr.io/cloud-builders/gsutil
entrypoint: 'bash'
args:
- '-c'
- |
gsutil cp ${_REPO}/java/target/dataproc-templates-1.0-SNAPSHOT.jar gs://${_PUBLIC_BUCKET}/$(date -u +%Y-%m-%d)_$TAG_NAME/java/
id: cp-java-egg-to-gcs-tag-folder
- name: gcr.io/cloud-builders/gsutil
args:
- cp
- dataproc-templates-1.0-SNAPSHOT.jar
- 'gs://${_PUBLIC_BUCKET}/latest/java/${_BINARY_PREFIX}.jar'
dir: '${_REPO}/java/target'
id: cp-java-jar-to-gcs-latest-folder
2 changes: 1 addition & 1 deletion java/.ci/UiJenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ pipeline {
catchError {
sh '''
if [ $GIT_BRANCH_LOCAL != "main" ];then
gsutil rm -r $GCS_STAGING_LOCATION 2> /dev/null || true
gsutil rm -r $jarPath 2> /dev/null || true
fi
'''
}
Expand Down
4 changes: 2 additions & 2 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import shutil
import io
import os
import logging
from distutils import log
from setuptools import setup, find_packages
from setuptools.command.bdist_egg import bdist_egg

Expand Down Expand Up @@ -66,7 +66,7 @@ def run(self):
built_egg_path: str = self.get_outputs()[0]

if self.output is not None:
logging.info(
log.info(
'Will rename output .egg file from %s to %s',
built_egg_path,
self.output
Expand Down
Loading