Skip to content

Commit b1f2ceb

Browse files
jklegarjklegar
authored
Move java components to feast-java repo (#1316)
* remove java code and modify pom.xml Signed-off-by: Jacob Klegar <jacob@tecton.ai> * move core and serving docker files Signed-off-by: Jacob Klegar <jacob@tecton.ai> * move one github action Signed-off-by: Jacob Klegar <jacob@tecton.ai> * move unit-test-java Signed-off-by: Jacob Klegar <jacob@tecton.ai> * move integration-test action Signed-off-by: Jacob Klegar <jacob@tecton.ai> * remove datatypes/java, pom.xml, java make commands Signed-off-by: Jacob Klegar <jacob@tecton.ai> * move building docker images to feast-java Signed-off-by: Jacob Klegar <jacob@tecton.ai> * move java release jobs to feast-java repo Signed-off-by: Jacob Klegar <jacob@tecton.ai> * remove lint-versions Signed-off-by: Jacob Klegar <jacob@tecton.ai> * don't build-push-docker-images for core and serving Signed-off-by: Jacob Klegar <jacob@tecton.ai> * more cleanup per comments Signed-off-by: Jacob Klegar <jacob@tecton.ai>
1 parent a335265 commit b1f2ceb

214 files changed

Lines changed: 8 additions & 20809 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/complete.yml‎

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,6 @@ name: complete
33
on: [push, pull_request]
44

55
jobs:
6-
build-push-docker-images:
7-
runs-on: [self-hosted]
8-
strategy:
9-
matrix:
10-
component: [core, serving, jupyter, ci]
11-
env:
12-
GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha }}
13-
REGISTRY: gcr.io/kf-feast
14-
MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
15-
steps:
16-
- uses: actions/checkout@v2
17-
- uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
18-
with:
19-
version: '290.0.1'
20-
export_default_credentials: true
21-
- run: gcloud auth configure-docker --quiet
22-
- name: Get m2 cache
23-
run: |
24-
infra/scripts/download-maven-cache.sh \
25-
--archive-uri ${MAVEN_CACHE} \
26-
--output-dir .
27-
- name: Build image
28-
run: make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
29-
- name: Push image
30-
run: |
31-
docker push ${REGISTRY}/feast-${{ matrix.component }}:${GITHUB_SHA}
32-
if [ -n "${GITHUB_PR_SHA}" ]; then
33-
docker tag ${REGISTRY}/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_PR_SHA}
34-
docker push ${REGISTRY}/feast-${{ matrix.component }}:${GITHUB_PR_SHA}
35-
fi
36-
37-
lint-java:
38-
container: gcr.io/kf-feast/feast-ci:latest
39-
runs-on: [ubuntu-latest]
40-
steps:
41-
- uses: actions/checkout@v2
42-
- name: Lint java
43-
run: make lint-java
44-
456
lint-python:
467
container: gcr.io/kf-feast/feast-ci:latest
478
runs-on: [ubuntu-latest]
@@ -64,37 +25,6 @@ jobs:
6425
- name: Lint go
6526
run: make lint-go
6627

67-
lint-versions:
68-
runs-on: [ubuntu-latest]
69-
steps:
70-
- uses: actions/checkout@v2
71-
- name: Lint versions throughout repo
72-
run: make lint-versions
73-
74-
unit-test-java:
75-
runs-on: ubuntu-latest
76-
needs: lint-java
77-
steps:
78-
- uses: actions/checkout@v2
79-
- name: Set up JDK 11
80-
uses: actions/setup-java@v1
81-
with:
82-
java-version: '11'
83-
java-package: jdk
84-
architecture: x64
85-
- uses: actions/cache@v2
86-
with:
87-
path: ~/.m2/repository
88-
key: ${{ runner.os }}-ut-maven-${{ hashFiles('**/pom.xml') }}
89-
restore-keys: |
90-
${{ runner.os }}-ut-maven-
91-
- name: Test java
92-
run: make test-java-with-coverage
93-
- uses: actions/upload-artifact@v2
94-
with:
95-
name: java-coverage-report
96-
path: ${{ github.workspace }}/docs/coverage/java/target/site/jacoco-aggregate/
97-
9828
unit-test-python:
9929
runs-on: ubuntu-latest
10030
needs: lint-python
@@ -117,33 +47,3 @@ jobs:
11747
- name: Test go
11848
run: make test-go
11949

120-
integration-test:
121-
runs-on: ubuntu-latest
122-
needs: unit-test-java
123-
steps:
124-
- uses: actions/checkout@v2
125-
- name: Set up JDK 11
126-
uses: actions/setup-java@v1
127-
with:
128-
java-version: '11'
129-
java-package: jdk
130-
architecture: x64
131-
- uses: actions/setup-python@v2
132-
with:
133-
python-version: '3.6'
134-
architecture: 'x64'
135-
- uses: actions/cache@v2
136-
with:
137-
path: ~/.m2/repository
138-
key: ${{ runner.os }}-it-maven-${{ hashFiles('**/pom.xml') }}
139-
restore-keys: |
140-
${{ runner.os }}-it-maven-
141-
- name: Run integration tests
142-
run: make test-java-integration
143-
- name: Save report
144-
uses: actions/upload-artifact@v2
145-
if: failure()
146-
with:
147-
name: it-report
148-
path: spark/ingestion/target/test-reports/TestSuite.txt
149-
retention-days: 5

‎.github/workflows/master_only.yml‎

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

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
needs: get-version
4949
strategy:
5050
matrix:
51-
component: [core, serving, jobservice, jupyter]
51+
component: [jobservice, jupyter]
5252
env:
5353
MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
5454
steps:
@@ -111,13 +111,11 @@ jobs:
111111
project_id: ${{ secrets.GCP_PROJECT_ID }}
112112
service_account_key: ${{ secrets.GCP_SA_KEY }}
113113
- run: gcloud auth configure-docker --quiet
114-
- name: Validate repository versions
115-
run: make lint-versions
116114
- name: Validate chart release versions
117115
run: ./infra/scripts/validate-helm-chart-docker-image.sh
118116
- name: Remove previous Helm
119117
run: sudo rm -rf $(which helm)
120118
- name: Install Helm
121119
run: ./infra/scripts/install-helm.sh
122120
- name: Publish Helm charts
123-
run: ./infra/scripts/sync-helm-charts.sh
121+
run: ./infra/scripts/sync-helm-charts.sh

‎.scalafmt.conf‎

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

‎Makefile‎

Lines changed: 6 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,20 @@
1717
ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
1818
PROTO_TYPE_SUBDIRS = core serving types storage
1919
PROTO_SERVICE_SUBDIRS = core serving
20-
MVN := mvn ${MAVEN_EXTRA_OPTS}
2120

2221
# General
2322

24-
format: format-python format-go format-java
23+
format: format-python format-go
2524

26-
lint: lint-python lint-go lint-java
25+
lint: lint-python lint-go
2726

28-
test: test-python test-java test-go
27+
test: test-python test-go
2928

3029
protos: compile-protos-go compile-protos-python compile-protos-docs
3130

32-
build: protos build-java build-docker build-html
31+
build: protos build-docker build-html
3332

34-
install-ci-dependencies: install-python-ci-dependencies install-go-ci-dependencies install-java-ci-dependencies
35-
36-
# Java
37-
38-
install-java-ci-dependencies:
39-
${MVN} verify clean --fail-never
40-
41-
format-java:
42-
${MVN} spotless:apply
43-
44-
lint-java:
45-
${MVN} --no-transfer-progress spotless:check
46-
47-
test-java:
48-
${MVN} --no-transfer-progress -DskipITs=true test
49-
50-
test-java-integration:
51-
${MVN} --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true clean verify
52-
53-
test-java-with-coverage:
54-
${MVN} --no-transfer-progress -DskipITs=true test jacoco:report-aggregate
55-
56-
build-java:
57-
${MVN} clean verify
58-
59-
build-java-no-tests:
60-
${MVN} --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true -DskipITs=true -Drevision=${REVISION} clean package
33+
install-ci-dependencies: install-python-ci-dependencies install-go-ci-dependencies
6134

6235
# Python SDK
6336

@@ -112,30 +85,16 @@ lint-go:
11285

11386
build-push-docker:
11487
@$(MAKE) build-docker registry=$(REGISTRY) version=$(VERSION)
115-
@$(MAKE) push-core-docker registry=$(REGISTRY) version=$(VERSION)
116-
@$(MAKE) push-serving-docker registry=$(REGISTRY) version=$(VERSION)
11788
@$(MAKE) push-ci-docker registry=$(REGISTRY) version=$(VERSION)
11889

119-
build-docker: build-core-docker build-serving-docker build-ci-docker
120-
121-
push-core-docker:
122-
docker push $(REGISTRY)/feast-core:$(VERSION)
123-
124-
push-serving-docker:
125-
docker push $(REGISTRY)/feast-serving:$(VERSION)
90+
build-docker: build-ci-docker
12691

12792
push-ci-docker:
12893
docker push $(REGISTRY)/feast-ci:$(VERSION)
12994

13095
push-jupyter-docker:
13196
docker push $(REGISTRY)/feast-jupyter:$(VERSION)
13297

133-
build-core-docker:
134-
docker build --build-arg VERSION=$(VERSION) -t $(REGISTRY)/feast-core:$(VERSION) -f infra/docker/core/Dockerfile .
135-
136-
build-serving-docker:
137-
docker build --build-arg VERSION=$(VERSION) -t $(REGISTRY)/feast-serving:$(VERSION) -f infra/docker/serving/Dockerfile .
138-
13998
build-ci-docker:
14099
docker build -t $(REGISTRY)/feast-ci:$(VERSION) -f infra/docker/ci/Dockerfile .
141100

@@ -183,11 +142,6 @@ build-html: clean-html
183142
cd $(ROOT_DIR)/sdk/python/docs && $(MAKE) html
184143
cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python
185144

186-
# Versions
187-
188-
lint-versions:
189-
./infra/scripts/validate-version-consistency.sh
190-
191145
# Performance
192146

193147
test-load:

0 commit comments

Comments
 (0)