This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 152b09f GEODE-9940: ci improvements (#7254)
152b09f is described below
commit 152b09f7c3f1e073b9e89a09687e676d468bfe0b
Author: Owen Nichols <[email protected]>
AuthorDate: Mon Jan 10 20:33:30 2022 -0800
GEODE-9940: ci improvements (#7254)
* fix mass test report trigger
* fix mass test report hang
* fix rc pipeline to trigger right the first time
---
ci/bin/concourse_job_performance.py | 4 ++--
ci/pipelines/mass-test-run/jinja.template.yml | 13 +++++++------
dev-tools/release/deploy_rc_pipeline.sh | 9 +++++++--
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ci/bin/concourse_job_performance.py
b/ci/bin/concourse_job_performance.py
index c604e4f..6c38af3 100755
--- a/ci/bin/concourse_job_performance.py
+++ b/ci/bin/concourse_job_performance.py
@@ -36,7 +36,7 @@ from colors import color
from tqdm import tqdm
import yaml
-TEST_FAILURE_REGEX = re.compile('(\S+)\s*>\s*(\S+).*FAILED')
+TEST_FAILURE_REGEX = re.compile('([A-Za-z_][A-Za-z0-9_]*) > ([A-Za-z_].*)
FAILED')
YELLOW_STARS_SEPARATOR =
color("***********************************************************************************",
fg='yellow')
@@ -73,7 +73,7 @@ def main(url, team, pipeline, job, number_of_builds,
authorization_cookie, threa
def get_cookie(url):
home = os.environ['HOME']
- data = yaml.load(open(f"{home}/.flyrc"))
+ data = yaml.safe_load(open(f"{home}/.flyrc"))
for target in data["targets"]:
api = data["targets"][target]["api"]
if api == url:
diff --git a/ci/pipelines/mass-test-run/jinja.template.yml
b/ci/pipelines/mass-test-run/jinja.template.yml
index 7233432..b5b548f 100644
--- a/ci/pipelines/mass-test-run/jinja.template.yml
+++ b/ci/pipelines/mass-test-run/jinja.template.yml
@@ -89,13 +89,13 @@ GRADLE_GLOBAL_ARGS: ((gradle-global-args))
resources:
-- name: weekly
+- name: weekly-fri
type: time
source:
- interval: 168h
+ interval: 62m
days: [Friday]
- start: 5PM
- stop: 11PM
+ start: 5:00PM
+ stop: 6:02PM
location: America/Los_Angeles
- name: test-finish-time
type: time
@@ -169,7 +169,7 @@ jobs:
serial: true
plan:
- in_parallel:
- - get: weekly
+ - get: weekly-fri
trigger: true
- get: geode
params:
@@ -183,7 +183,7 @@ jobs:
serial: true
plan:
- in_parallel:
- - get: weekly
+ - get: weekly-fri
trigger: true
passed: [pin-geode]
- get: alpine-tools-image
@@ -417,6 +417,7 @@ jobs:
passed: [poll-for-test-completion]
trigger: true
- task: create-job-performance-report
+ timeout: 15m
image: alpine-tools-image
config:
platform: linux
diff --git a/dev-tools/release/deploy_rc_pipeline.sh
b/dev-tools/release/deploy_rc_pipeline.sh
index 3ceae78..a8dd9dd 100755
--- a/dev-tools/release/deploy_rc_pipeline.sh
+++ b/dev-tools/release/deploy_rc_pipeline.sh
@@ -94,6 +94,7 @@ jobs:
- in_parallel:
- get: geode
trigger: true
+ passed: [verify-expected-files-and-keys]
- task: validate
timeout: 1h
config:
@@ -129,6 +130,7 @@ jobs:
- in_parallel:
- get: geode
trigger: true
+ passed: [verify-expected-files-and-keys]
- task: validate
timeout: 1h
config:
@@ -166,6 +168,7 @@ jobs:
- in_parallel:
- get: geode
trigger: true
+ passed: [verify-expected-files-and-keys]
- task: validate
timeout: 1h
config:
@@ -310,9 +313,9 @@ jobs:
plan:
- in_parallel:
- get: geode-native
- trigger: true
- get: geode
trigger: true
+ passed: [verify-expected-files-and-keys]
- task: validate
timeout: 1h
config:
@@ -359,6 +362,7 @@ jobs:
- in_parallel:
- get: geode
trigger: true
+ passed: [verify-expected-files-and-keys]
- get: upthewaterspout-tests
- get: geode-examples
- task: validate
@@ -527,6 +531,7 @@ jobs:
- in_parallel:
- get: geode
trigger: true
+ passed: [verify-expected-files-and-keys]
- task: validate
timeout: 1h
config:
@@ -576,6 +581,7 @@ jobs:
- in_parallel:
- get: geode
trigger: true
+ passed: [verify-expected-files-and-keys]
- get: geode-develop
- task: validate
timeout: 1h
@@ -612,7 +618,6 @@ jobs:
- verify-no-binaries
- build-geode-from-tag
- build-geode-from-src-tgz
- - verify-expected-files-and-keys
- get: geode-examples
passed:
- run-geode-examples-jdk11
