feast-dev · jklegar · Feb 15, 2021 · Jan 30, 2021 · Jan 30, 2021 · Feb 1, 2021
diff --git a/.github/workflows/complete.yml b/.github/workflows/complete.yml
@@ -3,45 +3,6 @@ name: complete
 on: [push, pull_request]
 
 jobs:
-  build-push-docker-images:
-    runs-on: [self-hosted]
-    strategy:
-      matrix:
-        component: [core, serving, jupyter, ci]
-    env:
-      GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha }}
-      REGISTRY: gcr.io/kf-feast
-      MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
-    steps:
-      - uses: actions/checkout@v2
-      - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
-        with:
-          version: '290.0.1'
-          export_default_credentials: true
-      - run: gcloud auth configure-docker --quiet
-      - name: Get m2 cache
-        run: |
-          infra/scripts/download-maven-cache.sh \
-          --archive-uri ${MAVEN_CACHE} \
-          --output-dir .
-      - name: Build image
-        run: make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA}
-      - name: Push image
-        run: |
-          docker push ${REGISTRY}/feast-${{ matrix.component }}:${GITHUB_SHA}
-          if [ -n "${GITHUB_PR_SHA}" ]; then
-            docker tag ${REGISTRY}/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_PR_SHA}
-            docker push ${REGISTRY}/feast-${{ matrix.component }}:${GITHUB_PR_SHA}
-          fi
-
-  lint-java:
-    container: gcr.io/kf-feast/feast-ci:latest
-    runs-on: [ubuntu-latest]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Lint java
-        run: make lint-java
-
   lint-python:
     container: gcr.io/kf-feast/feast-ci:latest
     runs-on: [ubuntu-latest]
@@ -64,37 +25,6 @@ jobs:
       - name: Lint go
         run: make lint-go
 
-  lint-versions:
-    runs-on: [ubuntu-latest]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Lint versions throughout repo
-        run: make lint-versions
-
-  unit-test-java:
-    runs-on: ubuntu-latest
-    needs: lint-java
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-          java-package: jdk
-          architecture: x64
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-ut-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-ut-maven-
-      - name: Test java
-        run: make test-java-with-coverage
-      - uses: actions/upload-artifact@v2
-        with:
-          name: java-coverage-report
-          path: ${{ github.workspace }}/docs/coverage/java/target/site/jacoco-aggregate/
-
   unit-test-python:
     runs-on: ubuntu-latest
     needs: lint-python
@@ -117,33 +47,3 @@ jobs:
       - name: Test go
         run: make test-go
 
-  integration-test:
-    runs-on: ubuntu-latest
-    needs: unit-test-java
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-          java-package: jdk
-          architecture: x64
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.6'
-          architecture: 'x64'
-      - uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-it-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-it-maven-
-      - name: Run integration tests
-        run:  make test-java-integration
-      - name: Save report
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: it-report
-          path: spark/ingestion/target/test-reports/TestSuite.txt
-          retention-days: 5
diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
     needs: get-version
     strategy:
       matrix:
-        component: [core, serving, jobservice, jupyter]
+        component: [jobservice, jupyter]
     env:
       MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar
     steps:
@@ -111,13 +111,11 @@ jobs:
           project_id: ${{ secrets.GCP_PROJECT_ID }}
           service_account_key: ${{ secrets.GCP_SA_KEY }}
       - run: gcloud auth configure-docker --quiet
-      - name: Validate repository versions
-        run: make lint-versions
       - name: Validate chart release versions
         run: ./infra/scripts/validate-helm-chart-docker-image.sh
       - name: Remove previous Helm
         run: sudo rm -rf $(which helm)
       - name: Install Helm
         run: ./infra/scripts/install-helm.sh
       - name: Publish Helm charts
-        run: ./infra/scripts/sync-helm-charts.sh
+        run: ./infra/scripts/sync-helm-charts.sh
diff --git a/.scalafmt.conf b/.scalafmt.conf
diff --git a/Makefile b/Makefile
@@ -17,47 +17,20 @@
 ROOT_DIR 	:= $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 PROTO_TYPE_SUBDIRS = core serving types storage
 PROTO_SERVICE_SUBDIRS = core serving
-MVN := mvn ${MAVEN_EXTRA_OPTS}
 
 # General
 
-format: format-python format-go format-java
+format: format-python format-go
 
-lint: lint-python lint-go lint-java
+lint: lint-python lint-go
 
-test: test-python test-java test-go
+test: test-python test-go
 
 protos: compile-protos-go compile-protos-python compile-protos-docs
 
-build: protos build-java build-docker build-html
+build: protos build-docker build-html
 
-install-ci-dependencies: install-python-ci-dependencies install-go-ci-dependencies install-java-ci-dependencies
-
-# Java
-
-install-java-ci-dependencies:
-	${MVN} verify clean --fail-never
-
-format-java:
-	${MVN} spotless:apply
-
-lint-java:
-	${MVN} --no-transfer-progress spotless:check
-
-test-java:
-	${MVN} --no-transfer-progress -DskipITs=true test
-
-test-java-integration:
-	${MVN} --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true clean verify
-
-test-java-with-coverage:
-	${MVN} --no-transfer-progress -DskipITs=true test jacoco:report-aggregate
-
-build-java:
-	${MVN} clean verify
-
-build-java-no-tests:
-	${MVN} --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true -DskipITs=true -Drevision=${REVISION} clean package
+install-ci-dependencies: install-python-ci-dependencies install-go-ci-dependencies
 
 # Python SDK
 
@@ -112,30 +85,16 @@ lint-go:
 
 build-push-docker:
 	@$(MAKE) build-docker registry=$(REGISTRY) version=$(VERSION)
-	@$(MAKE) push-core-docker registry=$(REGISTRY) version=$(VERSION)
-	@$(MAKE) push-serving-docker registry=$(REGISTRY) version=$(VERSION)
 	@$(MAKE) push-ci-docker registry=$(REGISTRY) version=$(VERSION)
 
-build-docker: build-core-docker build-serving-docker build-ci-docker
-
-push-core-docker:
-	docker push $(REGISTRY)/feast-core:$(VERSION)
-
-push-serving-docker:
-	docker push $(REGISTRY)/feast-serving:$(VERSION)
+build-docker: build-ci-docker
 
 push-ci-docker:
 	docker push $(REGISTRY)/feast-ci:$(VERSION)
 
 push-jupyter-docker:
 	docker push $(REGISTRY)/feast-jupyter:$(VERSION)
 
-build-core-docker:
-	docker build --build-arg VERSION=$(VERSION) -t $(REGISTRY)/feast-core:$(VERSION) -f infra/docker/core/Dockerfile .
-
-build-serving-docker:
-	docker build --build-arg VERSION=$(VERSION) -t $(REGISTRY)/feast-serving:$(VERSION) -f infra/docker/serving/Dockerfile .
-
 build-ci-docker:
 	docker build -t $(REGISTRY)/feast-ci:$(VERSION) -f infra/docker/ci/Dockerfile .
 
@@ -183,11 +142,6 @@ build-html: clean-html
 	cd 	$(ROOT_DIR)/sdk/python/docs && $(MAKE) html
 	cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python
 
-# Versions
-
-lint-versions:
-	./infra/scripts/validate-version-consistency.sh
-
 # Performance
 
 test-load: