From 0a96e442e88567fc7af5017bba1c872225ad667e Mon Sep 17 00:00:00 2001 From: Shu Heng Date: Thu, 13 Feb 2020 13:46:47 +0800 Subject: [PATCH 1/4] Use Java 8 SDK for branch 4.0 and Java 11 for master --- .prow/config.yaml | 108 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/.prow/config.yaml b/.prow/config.yaml index e947f440189..a923db5abc2 100644 --- a/.prow/config.yaml +++ b/.prow/config.yaml @@ -72,6 +72,22 @@ presubmits: requests: cpu: "2000m" memory: "1536Mi" + skip_branches: + - "^v0.4-branch" + + - name: test-core-and-ingestion-java-8 + decorate: true + always_run: true + spec: + containers: + - image: maven:3.6-jdk-8 + command: [".prow/scripts/test-core-ingestion.sh"] + resources: + requests: + cpu: "2000m" + memory: "1536Mi" + branches: + - "^v0.4-branch" - name: test-serving decorate: true @@ -80,6 +96,18 @@ presubmits: containers: - image: maven:3.6-jdk-11 command: [".prow/scripts/test-serving.sh"] + skip_branches: + - "^v0.4-branch" + + - name: test-serving-java-8 + decorate: true + always_run: true + spec: + containers: + - image: maven:3.6-jdk-8 + command: [".prow/scripts/test-serving.sh"] + branches: + - "^v0.4-branch" - name: test-java-sdk decorate: true @@ -88,6 +116,18 @@ presubmits: containers: - image: maven:3.6-jdk-11 command: [".prow/scripts/test-java-sdk.sh"] + skip_branches: + - "^v0.4-branch" + + - name: test-java-sdk-java-8 + decorate: true + always_run: true + spec: + containers: + - image: maven:3.6-jdk-8 + command: [".prow/scripts/test-java-sdk.sh"] + branches: + - "^v0.4-branch" - name: test-python-sdk decorate: true @@ -116,6 +156,22 @@ presubmits: requests: cpu: "6" memory: "6144Mi" + skip_branches: + - "^v0.4-branch" + + - name: test-end-to-end-java-8 + decorate: true + always_run: true + spec: + containers: + - image: maven:3.6-jdk-8 + command: [".prow/scripts/test-end-to-end.sh"] + resources: + requests: + cpu: "6" + memory: "6144Mi" + branches: + - "^v0.4-branch" - name: test-end-to-end-batch decorate: true @@ -135,6 +191,29 @@ presubmits: volumeMounts: - name: service-account mountPath: "/etc/service-account" + skip_branches: + - "^v0.4-branch" + + - name: test-end-to-end-batch-java-8 + decorate: true + always_run: true + spec: + volumes: + - name: service-account + secret: + secretName: feast-service-account + containers: + - image: maven:3.6-jdk-8 + command: [".prow/scripts/test-end-to-end-batch.sh"] + resources: + requests: + cpu: "6" + memory: "6144Mi" + volumeMounts: + - name: service-account + mountPath: "/etc/service-account" + branches: + - "^v0.4-branch" postsubmits: gojek/feast: @@ -187,10 +266,39 @@ postsubmits: - name: maven-settings secret: secretName: maven-settings + skip_branches: + - "^v0.4-branch" branches: # Filter on tags with semantic versioning, prefixed with "v" - ^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$ + - name: publish-java-8-sdk + decorate: true + spec: + containers: + - image: maven:3.6-jdk-8 + command: + - bash + - -c + - .prow/scripts/publish-java-sdk.sh --revision ${PULL_BASE_REF:1} + volumeMounts: + - name: gpg-keys + mountPath: /etc/gpg + readOnly: true + - name: maven-settings + mountPath: /root/.m2/settings.xml + subPath: settings.xml + readOnly: true + volumes: + - name: gpg-keys + secret: + secretName: gpg-keys + - name: maven-settings + secret: + secretName: maven-settings + branches: + - "^v0.4-branch" + - name: publish-docker-images decorate: true spec: From 87e0d4ca7bcba2072a12fb6a4f97e28d717b6108 Mon Sep 17 00:00:00 2001 From: Shu Heng Date: Thu, 13 Feb 2020 14:03:47 +0800 Subject: [PATCH 2/4] Add Java 8 tests for branch v3.0 --- .prow/config.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.prow/config.yaml b/.prow/config.yaml index a923db5abc2..ebb12dcdf77 100644 --- a/.prow/config.yaml +++ b/.prow/config.yaml @@ -74,6 +74,7 @@ presubmits: memory: "1536Mi" skip_branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-core-and-ingestion-java-8 decorate: true @@ -88,6 +89,7 @@ presubmits: memory: "1536Mi" branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-serving decorate: true @@ -98,6 +100,7 @@ presubmits: command: [".prow/scripts/test-serving.sh"] skip_branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-serving-java-8 decorate: true @@ -108,6 +111,7 @@ presubmits: command: [".prow/scripts/test-serving.sh"] branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-java-sdk decorate: true @@ -118,6 +122,7 @@ presubmits: command: [".prow/scripts/test-java-sdk.sh"] skip_branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-java-sdk-java-8 decorate: true @@ -128,6 +133,7 @@ presubmits: command: [".prow/scripts/test-java-sdk.sh"] branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-python-sdk decorate: true @@ -158,6 +164,7 @@ presubmits: memory: "6144Mi" skip_branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-end-to-end-java-8 decorate: true @@ -172,6 +179,7 @@ presubmits: memory: "6144Mi" branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-end-to-end-batch decorate: true @@ -193,6 +201,7 @@ presubmits: mountPath: "/etc/service-account" skip_branches: - "^v0.4-branch" + - "^v0.3-branch" - name: test-end-to-end-batch-java-8 decorate: true @@ -214,6 +223,7 @@ presubmits: mountPath: "/etc/service-account" branches: - "^v0.4-branch" + - "^v0.3-branch" postsubmits: gojek/feast: @@ -268,6 +278,7 @@ postsubmits: secretName: maven-settings skip_branches: - "^v0.4-branch" + - "^v0.3-branch" branches: # Filter on tags with semantic versioning, prefixed with "v" - ^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$ @@ -298,6 +309,7 @@ postsubmits: secretName: maven-settings branches: - "^v0.4-branch" + - "^v0.3-branch" - name: publish-docker-images decorate: true From 6540b0fdeb0f7cb0bba4b43284851ec71bd78e61 Mon Sep 17 00:00:00 2001 From: Shu Heng Date: Thu, 13 Feb 2020 14:26:56 +0800 Subject: [PATCH 3/4] Semantic versioning for publish java sdk --- .prow/config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.prow/config.yaml b/.prow/config.yaml index ebb12dcdf77..a16f722c502 100644 --- a/.prow/config.yaml +++ b/.prow/config.yaml @@ -308,8 +308,7 @@ postsubmits: secret: secretName: maven-settings branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$ - name: publish-docker-images decorate: true From 270545a7d12b9156345374259e3d49a2b23de2af Mon Sep 17 00:00:00 2001 From: Shu Heng Date: Thu, 13 Feb 2020 14:33:23 +0800 Subject: [PATCH 4/4] Fix branch filter refex --- .prow/config.yaml | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/.prow/config.yaml b/.prow/config.yaml index a16f722c502..3ae9fcbe609 100644 --- a/.prow/config.yaml +++ b/.prow/config.yaml @@ -73,8 +73,7 @@ presubmits: cpu: "2000m" memory: "1536Mi" skip_branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-core-and-ingestion-java-8 decorate: true @@ -88,8 +87,7 @@ presubmits: cpu: "2000m" memory: "1536Mi" branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-serving decorate: true @@ -99,8 +97,7 @@ presubmits: - image: maven:3.6-jdk-11 command: [".prow/scripts/test-serving.sh"] skip_branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-serving-java-8 decorate: true @@ -110,8 +107,7 @@ presubmits: - image: maven:3.6-jdk-8 command: [".prow/scripts/test-serving.sh"] branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-java-sdk decorate: true @@ -121,8 +117,7 @@ presubmits: - image: maven:3.6-jdk-11 command: [".prow/scripts/test-java-sdk.sh"] skip_branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-java-sdk-java-8 decorate: true @@ -132,8 +127,7 @@ presubmits: - image: maven:3.6-jdk-8 command: [".prow/scripts/test-java-sdk.sh"] branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-python-sdk decorate: true @@ -163,8 +157,7 @@ presubmits: cpu: "6" memory: "6144Mi" skip_branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-end-to-end-java-8 decorate: true @@ -178,8 +171,7 @@ presubmits: cpu: "6" memory: "6144Mi" branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-end-to-end-batch decorate: true @@ -200,8 +192,7 @@ presubmits: - name: service-account mountPath: "/etc/service-account" skip_branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ - name: test-end-to-end-batch-java-8 decorate: true @@ -222,8 +213,7 @@ presubmits: - name: service-account mountPath: "/etc/service-account" branches: - - "^v0.4-branch" - - "^v0.3-branch" + - ^v0\.(3|4)-branch$ postsubmits: gojek/feast: @@ -277,10 +267,11 @@ postsubmits: secret: secretName: maven-settings skip_branches: - - "^v0.4-branch" - - "^v0.3-branch" + # Skip version 0.3 and 0.4 + - ^v0\.(3|4)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$ + branches: - # Filter on tags with semantic versioning, prefixed with "v" + # Filter on tags with semantic versioning, prefixed with "v". - ^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$ - name: publish-java-8-sdk @@ -308,6 +299,7 @@ postsubmits: secret: secretName: maven-settings branches: + # Filter on tags with semantic versioning, prefixed with "v". v0.3 and v0.4 only. - ^v0\.(3|4)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$ - name: publish-docker-images