From 18e34a55585fe37b92cc047399c73977c33098fc Mon Sep 17 00:00:00 2001 From: Khor Shu Heng Date: Mon, 27 Apr 2020 11:06:14 +0800 Subject: [PATCH] Move e2e test scripts from .prow to infra --- .prow/config.yaml | 30 +++++++++---------- .../scripts/download-maven-cache.sh | 0 .../scripts/install-google-cloud-sdk.sh | 0 .../scripts/publish-docker-image.sh | 0 {.prow => infra}/scripts/publish-java-sdk.sh | 0 .../scripts/publish-python-sdk.sh | 0 {.prow => infra}/scripts/sync-helm-charts.sh | 0 .../scripts/test-core-ingestion.sh | 2 +- .../scripts/test-end-to-end-batch.sh | 2 +- {.prow => infra}/scripts/test-end-to-end.sh | 2 +- {.prow => infra}/scripts/test-golang-sdk.sh | 0 {.prow => infra}/scripts/test-java-sdk.sh | 0 {.prow => infra}/scripts/test-python-sdk.sh | 0 {.prow => infra}/scripts/test-serving.sh | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) rename {.prow => infra}/scripts/download-maven-cache.sh (100%) rename {.prow => infra}/scripts/install-google-cloud-sdk.sh (100%) rename {.prow => infra}/scripts/publish-docker-image.sh (100%) rename {.prow => infra}/scripts/publish-java-sdk.sh (100%) rename {.prow => infra}/scripts/publish-python-sdk.sh (100%) rename {.prow => infra}/scripts/sync-helm-charts.sh (100%) rename {.prow => infra}/scripts/test-core-ingestion.sh (95%) rename {.prow => infra}/scripts/test-end-to-end-batch.sh (99%) rename {.prow => infra}/scripts/test-end-to-end.sh (99%) rename {.prow => infra}/scripts/test-golang-sdk.sh (100%) rename {.prow => infra}/scripts/test-java-sdk.sh (100%) rename {.prow => infra}/scripts/test-python-sdk.sh (100%) rename {.prow => infra}/scripts/test-serving.sh (90%) diff --git a/.prow/config.yaml b/.prow/config.yaml index 39b81d76fd..b7eec63924 100644 --- a/.prow/config.yaml +++ b/.prow/config.yaml @@ -67,7 +67,7 @@ presubmits: spec: containers: - image: maven:3.6-jdk-8 - command: [".prow/scripts/test-core-ingestion.sh"] + command: ["infra/scripts/test-core-ingestion.sh"] resources: requests: cpu: "1000m" @@ -81,7 +81,7 @@ presubmits: spec: containers: - image: maven:3.6-jdk-8 - command: [".prow/scripts/test-serving.sh"] + command: ["infra/scripts/test-serving.sh"] - name: test-java-sdk decorate: true @@ -89,7 +89,7 @@ presubmits: spec: containers: - image: maven:3.6-jdk-8 - command: [".prow/scripts/test-java-sdk.sh"] + command: ["infra/scripts/test-java-sdk.sh"] - name: test-python-sdk decorate: true @@ -97,7 +97,7 @@ presubmits: spec: containers: - image: python:3.7 - command: [".prow/scripts/test-python-sdk.sh"] + command: ["infra/scripts/test-python-sdk.sh"] - name: test-golang-sdk decorate: true @@ -105,7 +105,7 @@ presubmits: spec: containers: - image: golang:1.13 - command: [".prow/scripts/test-golang-sdk.sh"] + command: ["infra/scripts/test-golang-sdk.sh"] - name: test-end-to-end decorate: true @@ -113,7 +113,7 @@ presubmits: spec: containers: - image: maven:3.6-jdk-8 - command: [".prow/scripts/test-end-to-end.sh"] + command: ["infra/scripts/test-end-to-end.sh"] resources: requests: cpu: "1000m" @@ -131,7 +131,7 @@ presubmits: secretName: feast-service-account containers: - image: maven:3.6-jdk-8 - command: [".prow/scripts/test-end-to-end-batch.sh"] + command: ["infra/scripts/test-end-to-end-batch.sh"] resources: requests: cpu: "1000m" @@ -153,7 +153,7 @@ postsubmits: - sh - -c - | - .prow/scripts/publish-python-sdk.sh \ + infra/scripts/publish-python-sdk.sh \ --directory-path sdk/python --repository pypi volumeMounts: - name: pypirc @@ -177,7 +177,7 @@ postsubmits: command: - bash - -c - - .prow/scripts/publish-java-sdk.sh --revision ${PULL_BASE_REF:1} + - infra/scripts/publish-java-sdk.sh --revision ${PULL_BASE_REF:1} volumeMounts: - name: gpg-keys mountPath: /etc/gpg @@ -206,19 +206,19 @@ postsubmits: - bash - -c - | - .prow/scripts/download-maven-cache.sh \ + infra/scripts/download-maven-cache.sh \ --archive-uri gs://feast-templocation-kf-feast/.m2.2019-10-24.tar \ --output-dir $PWD/ if [ $PULL_BASE_REF == "master" ]; then - .prow/scripts/publish-docker-image.sh \ + infra/scripts/publish-docker-image.sh \ --repository gcr.io/kf-feast/feast-core \ --tag dev \ --file infra/docker/core/Dockerfile \ --google-service-account-file /etc/gcloud/service-account.json - .prow/scripts/publish-docker-image.sh \ + infra/scripts/publish-docker-image.sh \ --repository gcr.io/kf-feast/feast-serving \ --tag dev \ --file infra/docker/serving/Dockerfile \ @@ -232,13 +232,13 @@ postsubmits: else - .prow/scripts/publish-docker-image.sh \ + infra/scripts/publish-docker-image.sh \ --repository gcr.io/kf-feast/feast-core \ --tag ${PULL_BASE_REF:1} \ --file infra/docker/core/Dockerfile \ --google-service-account-file /etc/gcloud/service-account.json - .prow/scripts/publish-docker-image.sh \ + infra/scripts/publish-docker-image.sh \ --repository gcr.io/kf-feast/feast-serving \ --tag ${PULL_BASE_REF:1} \ --file infra/docker/serving/Dockerfile \ @@ -295,7 +295,7 @@ postsubmits: sed -i "/version: /c\version: ${PULL_BASE_REF:1}" infra/charts/feast/charts/feast-serving/Chart.yaml sed -i "/ tag: /c\ tag: ${PULL_BASE_REF:1}" infra/charts/feast/charts/feast-serving/values.yaml - .prow/scripts/sync-helm-charts.sh + infra/scripts/sync-helm-charts.sh volumeMounts: - name: service-account mountPath: /etc/gcloud/service-account.json diff --git a/.prow/scripts/download-maven-cache.sh b/infra/scripts/download-maven-cache.sh similarity index 100% rename from .prow/scripts/download-maven-cache.sh rename to infra/scripts/download-maven-cache.sh diff --git a/.prow/scripts/install-google-cloud-sdk.sh b/infra/scripts/install-google-cloud-sdk.sh similarity index 100% rename from .prow/scripts/install-google-cloud-sdk.sh rename to infra/scripts/install-google-cloud-sdk.sh diff --git a/.prow/scripts/publish-docker-image.sh b/infra/scripts/publish-docker-image.sh similarity index 100% rename from .prow/scripts/publish-docker-image.sh rename to infra/scripts/publish-docker-image.sh diff --git a/.prow/scripts/publish-java-sdk.sh b/infra/scripts/publish-java-sdk.sh similarity index 100% rename from .prow/scripts/publish-java-sdk.sh rename to infra/scripts/publish-java-sdk.sh diff --git a/.prow/scripts/publish-python-sdk.sh b/infra/scripts/publish-python-sdk.sh similarity index 100% rename from .prow/scripts/publish-python-sdk.sh rename to infra/scripts/publish-python-sdk.sh diff --git a/.prow/scripts/sync-helm-charts.sh b/infra/scripts/sync-helm-charts.sh similarity index 100% rename from .prow/scripts/sync-helm-charts.sh rename to infra/scripts/sync-helm-charts.sh diff --git a/.prow/scripts/test-core-ingestion.sh b/infra/scripts/test-core-ingestion.sh similarity index 95% rename from .prow/scripts/test-core-ingestion.sh rename to infra/scripts/test-core-ingestion.sh index 98a47ca68c..b7ec1d814b 100755 --- a/.prow/scripts/test-core-ingestion.sh +++ b/infra/scripts/test-core-ingestion.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -.prow/scripts/download-maven-cache.sh \ +infra/scripts/download-maven-cache.sh \ --archive-uri gs://feast-templocation-kf-feast/.m2.2019-10-24.tar \ --output-dir /root/ diff --git a/.prow/scripts/test-end-to-end-batch.sh b/infra/scripts/test-end-to-end-batch.sh similarity index 99% rename from .prow/scripts/test-end-to-end-batch.sh rename to infra/scripts/test-end-to-end-batch.sh index b7c1794691..bfd6545ee8 100755 --- a/.prow/scripts/test-end-to-end-batch.sh +++ b/infra/scripts/test-end-to-end-batch.sh @@ -79,7 +79,7 @@ Building jars for Feast ============================================================ " -.prow/scripts/download-maven-cache.sh \ +infra/scripts/download-maven-cache.sh \ --archive-uri gs://feast-templocation-kf-feast/.m2.2019-10-24.tar \ --output-dir /root/ diff --git a/.prow/scripts/test-end-to-end.sh b/infra/scripts/test-end-to-end.sh similarity index 99% rename from .prow/scripts/test-end-to-end.sh rename to infra/scripts/test-end-to-end.sh index 951972f8e6..3f9f31e80c 100755 --- a/.prow/scripts/test-end-to-end.sh +++ b/infra/scripts/test-end-to-end.sh @@ -62,7 +62,7 @@ Building jars for Feast ============================================================ " -.prow/scripts/download-maven-cache.sh \ +infra/scripts/download-maven-cache.sh \ --archive-uri gs://feast-templocation-kf-feast/.m2.2019-10-24.tar \ --output-dir /root/ diff --git a/.prow/scripts/test-golang-sdk.sh b/infra/scripts/test-golang-sdk.sh similarity index 100% rename from .prow/scripts/test-golang-sdk.sh rename to infra/scripts/test-golang-sdk.sh diff --git a/.prow/scripts/test-java-sdk.sh b/infra/scripts/test-java-sdk.sh similarity index 100% rename from .prow/scripts/test-java-sdk.sh rename to infra/scripts/test-java-sdk.sh diff --git a/.prow/scripts/test-python-sdk.sh b/infra/scripts/test-python-sdk.sh similarity index 100% rename from .prow/scripts/test-python-sdk.sh rename to infra/scripts/test-python-sdk.sh diff --git a/.prow/scripts/test-serving.sh b/infra/scripts/test-serving.sh similarity index 90% rename from .prow/scripts/test-serving.sh rename to infra/scripts/test-serving.sh index b56001619b..ce9dc0a816 100755 --- a/.prow/scripts/test-serving.sh +++ b/infra/scripts/test-serving.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -.prow/scripts/download-maven-cache.sh \ +infra/scripts/download-maven-cache.sh \ --archive-uri gs://feast-templocation-kf-feast/.m2.2019-10-24.tar \ --output-dir /root/