Skip to content

make aws e2e tests use correct feast_version #1159

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.

Sign up for GitHub

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

Merged
feast-ci-bot merged 1 commit into from
Nov 12, 2020
Merged

make aws e2e tests use correct feast_version #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
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

Expand All @@ -35,28 +36,28 @@ install-ci-dependencies: install-python-ci-dependencies install-go-ci-dependenci
# Java

install-java-ci-dependencies:
mvn verify clean --fail-never
${MVN} verify clean --fail-never

format-java:
mvn spotless:apply
${MVN} spotless:apply

lint-java:
mvn --no-transfer-progress spotless:check
${MVN} --no-transfer-progress spotless:check

test-java:
mvn --no-transfer-progress test
${MVN} --no-transfer-progress test

test-java-integration:
mvn --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true clean verify
${MVN} --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true clean verify

test-java-with-coverage:
mvn --no-transfer-progress test jacoco:report-aggregate
${MVN} --no-transfer-progress test jacoco:report-aggregate

build-java:
mvn clean verify
${MVN} clean verify

build-java-no-tests:
mvn --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true -Drevision=${REVISION} clean package
${MVN} --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true -Drevision=${REVISION} clean package

# Python SDK

Expand Down Expand Up @@ -141,13 +142,13 @@ push-jupyter-docker:
docker push $(REGISTRY)/feast-jupyter:$(VERSION)

build-core-docker:
docker build --build-arg REVISION=$(REVISION) -t $(REGISTRY)/feast-core:$(VERSION) -f infra/docker/core/Dockerfile .
docker build $(if, $(REVISION),--build-arg REVISION=$(REVISION),) -t $(REGISTRY)/feast-core:$(VERSION) -f infra/docker/core/Dockerfile .

build-jobservice-docker:
docker build -t $(REGISTRY)/feast-jobservice:$(VERSION) -f infra/docker/jobservice/Dockerfile .

build-serving-docker:
docker build --build-arg REVISION=$(REVISION) -t $(REGISTRY)/feast-serving:$(VERSION) -f infra/docker/serving/Dockerfile .
docker build $(if, $(REVISION),--build-arg REVISION=$(REVISION),) -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 .
Expand Down
5 changes: 3 additions & 2 deletions infra/scripts/setup-e2e-env-aws.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ python -m pip install -qr sdk/python/requirements-dev.txt
python -m pip install -qr tests/requirements.txt

# Using mvn -q to make it less verbose. This step happens after docker containers were
# succesfully built so it should be unlikely to fail.
# succesfully built so it should be unlikely to fail, therefore we likely won't need detailed logs.
echo "########## Building ingestion jar"
TIMEFORMAT='########## took %R seconds'
time mvn -q --no-transfer-progress -Dmaven.javadoc.skip=true -Dgpg.skip -DskipUTs=true clean package

time make build-java-no-tests REVISION=develop MAVEN_EXTRA_OPTS="-q --no-transfer-progress"
1 change: 1 addition & 0 deletions infra/scripts/test-end-to-end-aws.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export DISABLE_FEAST_SERVICE_FIXTURES=1
export DISABLE_SERVICE_FIXTURES=1

PYTHONPATH=sdk/python pytest tests/e2e/ \
--feast-version develop \
--core-url cicd-feast-core:6565 \
--serving-url cicd-feast-online-serving:6566 \
--env aws \
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/fixtures/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ def project_root():
def project_version(pytestconfig):
if pytestconfig.getoption("feast_version"):
return pytestconfig.getoption("feast_version")

return "0.8-SNAPSHOT"
else:
raise Exception("feast_version not set")