ci: Fix improper workflow setup. Exclude test resource phase when Jav…

…a integration tests are skipped Signed-off-by: Danny Chiao <[email protected]>
feast-dev · Aug 11, 2022 · 4962fb4 · 4962fb4
1 parent 0702310
commit 4962fb4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 84 deletions.
diff --git a/.github/workflows/java_master_only.yml b/.github/workflows/java_master_only.yml
@@ -69,46 +69,6 @@ jobs:
           java-version: '11'
           java-package: jdk
           architecture: x64
-      - name: Setup Python (to call feast apply)
-        uses: actions/setup-python@v2
-        id: setup-python
-        with:
-          python-version: 3.8
-          architecture: x64
-      - name: Setup Go
-        id: setup-go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.18.0
-      - name: Upgrade pip version
-        run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
-      - name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-      - name: pip cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ steps.pip-cache.outputs.dir }}
-            /opt/hostedtoolcache/Python
-            /Users/runner/hostedtoolcache/Python
-          key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
-          restore-keys: |
-            ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
-      - name: Install pip-tools
-        run: pip install pip-tools
-      - name: Install apache-arrow on ubuntu
-        run: |
-          sudo apt update
-          sudo apt install -y -V ca-certificates lsb-release wget
-          wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
-          sudo apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
-          sudo apt update
-          sudo apt install -y -V libarrow-dev
-      - name: Install Python dependencies
-        run: make install-python-ci-dependencies
       - uses: actions/cache@v2
         with:
           path: ~/.m2/repository
@@ -131,6 +91,8 @@ jobs:
   integration-test:
     if: github.repository == 'feast-dev/feast'
     runs-on: ubuntu-latest
+    env:
+      PYTHON: 3.8
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/java_pr.yml b/.github/workflows/java_pr.yml
@@ -40,46 +40,6 @@ jobs:
           java-version: '11'
           java-package: jdk
           architecture: x64
-      - name: Setup Python (to call feast apply)
-        uses: actions/setup-python@v2
-        id: setup-python
-        with:
-          python-version: 3.8
-          architecture: x64
-      - name: Setup Go
-        id: setup-go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.18.0
-      - name: Upgrade pip version
-        run: |
-          pip install --upgrade "pip>=21.3.1,<22.1"
-      - name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-      - name: pip cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ steps.pip-cache.outputs.dir }}
-            /opt/hostedtoolcache/Python
-            /Users/runner/hostedtoolcache/Python
-          key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
-          restore-keys: |
-            ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
-      - name: Install pip-tools
-        run: pip install pip-tools
-      - name: Install apache-arrow on ubuntu
-        run: |
-          sudo apt update
-          sudo apt install -y -V ca-certificates lsb-release wget
-          wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
-          sudo apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
-          sudo apt update
-          sudo apt install -y -V libarrow-dev
-      - name: Install Python dependencies
-        run: make install-python-ci-dependencies
       - uses: actions/cache@v2
         with:
           path: ~/.m2/repository
@@ -135,6 +95,8 @@ jobs:
       github.repository == 'feast-dev/feast'
     runs-on: ubuntu-latest
     needs: unit-test-java
+    env:
+      PYTHON: 3.8
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/java/infra/docker/feature-server/Dockerfile b/java/infra/docker/feature-server/Dockerfile
@@ -16,15 +16,15 @@ COPY java/coverage/pom.xml coverage/pom.xml
 # user to optionally use cached repository when building the image by copying
 # the existing .m2 directory to $FEAST_REPO_ROOT/.m2
 ENV MAVEN_OPTS="-Dmaven.repo.local=/build/.m2/repository -DdependencyLocationsEnabled=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3"
-COPY java/pom.xml .m2/* .m2/
+#COPY java/pom.xml .m2/* .m2/
 RUN mvn dependency:go-offline -DexcludeGroupIds:dev.feast 2>/dev/null || true
 
 COPY java/ .
 COPY protos/feast datatypes/src/main/proto/feast
 
 ARG VERSION=dev
 RUN mvn --also-make --projects serving -Drevision=$VERSION \
-  -DskipUTs=true --batch-mode clean package
+  -DskipUTs=true -DskipITs=true --batch-mode clean package
 #
 # Download grpc_health_probe to run health check for Feast Serving
 # https://kubernetes.io/blog/2018/10/01/health-checking-grpc-servers-on-kubernetes/

diff --git a/java/serving/pom.xml b/java/serving/pom.xml
@@ -95,6 +95,7 @@
               <arguments>
                 <argument>setup_it.py</argument>
               </arguments>
+              <skip>${skipITs}</skip>
             </configuration>
             <id>feast_test_apply</id>
             <phase>process-test-resources</phase>

diff --git a/java/serving/src/test/resources/docker-compose/feast10/setup_it.py b/java/serving/src/test/resources/docker-compose/feast10/setup_it.py
@@ -42,8 +42,8 @@ def setup_data():
     # (link https://docs.google.com/document/d/12UuvTQnTTCJhdRgy6h10zSbInNGSyEJkIxpOcgOen1I/edit)
     # about this benchmark setup
     def generate_data(
-        num_rows: int, num_features: int, destination: str
-    ) -> pd.DataFrame:
+        num_rows, num_features, destination
+    ):
         features = [f"feature_{i}" for i in range(num_features)]
         columns = ["entity", "event_timestamp"] + features
         df = pd.DataFrame(0, index=np.arange(num_rows), columns=columns)