Skip to content

Commit 91e34a2

Browse files
tokokotokoko
authored
chore: Move feast install to docker build in java it tests (feast-dev#4126)
* chore: Move feast install to docker build in java it tests Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * remove commented out lines in compose file Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * make local compose mode default Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * limit COPY contents Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * remove requirements.txt from java tests docker image Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * include pyproject.toml in dockerfile Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * change links to depends_on Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * try updating setup-python to v5 Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * pin macos image to macos-12 Signed-off-by: tokoko <togurg14@freeuni.edu.ge> * force rerun Signed-off-by: tokoko <togurg14@freeuni.edu.ge> --------- Signed-off-by: tokoko <togurg14@freeuni.edu.ge>
1 parent 0c30e96 commit 91e34a2

File tree

12 files changed

+23
-41
lines changed

12 files changed

+23
-41
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
},
88
"ghcr.io/devcontainers/features/python:1": {
99
"version": "3.9"
10-
},
11-
"ghcr.io/meaningful-ooo/devcontainer-features/homebrew:2": {
12-
"version": "latest"
1310
}
1411
},
15-
"postCreateCommand": "brew install mysql && pip install -e '.[dev]' && make compile-protos-python"
12+
"postCreateCommand": "pip install -e '.[dev]' && make compile-protos-python"
1613
}

‎.github/fork_workflows/fork_pr_integration_tests_aws.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
sudo apt update
139139
sudo apt install -y -V libarrow-dev
140140
- name: Install apache-arrow on macos
141-
if: matrix.os == 'macOS-latest'
141+
if: matrix.os == 'macos-12'
142142
run: |
143143
brew install apache-arrow
144144
brew install pkg-config

‎.github/fork_workflows/fork_pr_integration_tests_gcp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
sudo apt update
8383
sudo apt install -y -V libarrow-dev
8484
- name: Install apache-arrow on macos
85-
if: matrix.os == 'macOS-latest'
85+
if: matrix.os == 'macOS-12'
8686
run: |
8787
brew install apache-arrow
8888
brew install pkg-config

‎.github/fork_workflows/fork_pr_integration_tests_snowflake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
sudo apt update
7373
sudo apt install -y -V libarrow-dev
7474
- name: Install apache-arrow on macos
75-
if: matrix.os == 'macOS-latest'
75+
if: matrix.os == 'macos-12'
7676
run: |
7777
brew install apache-arrow
7878
brew install pkg-config

‎.github/workflows/build_wheels.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
build-source-distribution:
8181
name: Build source distribution
82-
runs-on: macos-latest
82+
runs-on: macos-12
8383
steps:
8484
- uses: actions/checkout@v3
8585
- name: Setup Python
@@ -136,7 +136,7 @@ jobs:
136136
needs: [build-python-wheel, build-source-distribution, get-version]
137137
strategy:
138138
matrix:
139-
os: [ubuntu-latest, macos-latest ]
139+
os: [ubuntu-latest, macos-12 ]
140140
python-version: ["3.9", "3.10"]
141141
from-source: [ True, False ]
142142
env:
@@ -165,7 +165,7 @@ jobs:
165165
name: wheels
166166
path: dist
167167
- name: Install OS X dependencies
168-
if: matrix.os == 'macos-latest'
168+
if: matrix.os == 'macos-12'
169169
run: brew install coreutils
170170
- name: Install wheel
171171
if: ${{ !matrix.from-source }}

‎.github/workflows/nightly-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
sudo apt update
203203
sudo apt install -y -V libarrow-dev
204204
- name: Install apache-arrow on macos
205-
if: matrix.os == 'macOS-latest'
205+
if: matrix.os == 'macos-12'
206206
run: brew install apache-arrow
207207
- name: Install dependencies
208208
run: make install-python-ci-dependencies

‎.github/workflows/unit_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
fail-fast: false
99
matrix:
1010
python-version: [ "3.9", "3.10" ]
11-
os: [ ubuntu-latest, macOS-latest ]
11+
os: [ ubuntu-latest, macos-12 ]
1212
exclude:
13-
- os: macOS-latest
13+
- os: macos-12
1414
python-version: "3.9"
1515
env:
1616
OS: ${{ matrix.os }}

‎java/serving/src/test/java/feast/serving/it/ServingEnvironment.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,8 @@ static void globalSetup() {
6262
.withExposedService("redis", 6379)
6363
.withExposedService(
6464
"feast", 8080, Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(180)))
65-
.withTailChildContainers(true);
66-
67-
if (System.getenv("FEAST_TESTCONTAINERS_LOCAL_COMPOSE") != null) {
68-
environment = environment.withLocalCompose(true);
69-
}
65+
.withTailChildContainers(true)
66+
.withLocalCompose(true);
7067

7168
environment.start();
7269
}

‎java/serving/src/test/resources/docker-compose/docker-compose-redis-it.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
version: '3'
2-
31
services:
42
redis:
53
image: redis:6.2
64
command: redis-server --requirepass testpw
75
ports:
86
- "6379"
97
feast:
10-
build: feast10
8+
build:
9+
context: ../../../../../../
10+
dockerfile: java/serving/src/test/resources/docker-compose/feast10/Dockerfile
1111
ports:
1212
- "8080"
13-
links:
13+
depends_on:
1414
- redis
15-
volumes:
16-
- $PWD/../../../../../../:/mnt/feast
17-

‎java/serving/src/test/resources/docker-compose/feast10/Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
FROM python:3.9
22

3-
WORKDIR /usr/src/
4-
5-
COPY requirements.txt ./
6-
RUN pip install --no-cache-dir -r requirements.txt
7-
83
WORKDIR /app
9-
COPY . .
4+
COPY java/serving/src/test/resources/docker-compose/feast10/ .
5+
COPY sdk/python /mnt/feast/sdk/python
6+
COPY protos /mnt/feast/protos
7+
COPY setup.py /mnt/feast/setup.py
8+
COPY pyproject.toml /mnt/feast/pyproject.toml
9+
COPY README.md /mnt/feast/README.md
10+
RUN cd /mnt/feast && SETUPTOOLS_SCM_PRETEND_VERSION="0.1.0" pip install .[grpcio,redis]
1011
EXPOSE 8080
1112

1213
CMD ["./entrypoint.sh"]

0 commit comments

Comments
 (0)