Code Review / infra / cicd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: b8e1150)
Merge "Add a job for feature tests"
authorFeruzjon Muyassarov <feruzjon.muyassarov@est.tech>
Tue, 2 Jun 2020 08:56:10 +0000 (08:56 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Tue, 2 Jun 2020 08:56:10 +0000 (08:56 +0000)
15 files changed:
jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml patch | blob | history
jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml patch | blob | history
jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml patch | blob | history
jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml patch | blob | history
jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml patch | blob | history
jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml patch | blob | history
jjb/geode/apache-geode-test-coordinator.yaml patch | blob | history
jjb/geode/apache-geode-test/apache-geode-acceptance-test.yaml patch | blob | history
jjb/geode/apache-geode-test/apache-geode-api-test.yaml [new file with mode: 0644] patch | blob
jjb/geode/apache-geode-test/apache-geode-distributed-test.yaml patch | blob | history
jjb/geode/apache-geode-test/apache-geode-integration-test.yaml patch | blob | history
jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml patch | blob | history
jjb/geode/apache-geode-test/apache-geode-unit-test.yaml patch | blob | history
jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml patch | blob | history
jjb/geode/global-template-apache-geode-test.yaml patch | blob | history

diff --git a/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml
index 098bf4ef3d85783577ca78879cf54116e702190f..59584aff94b2fac91e5febc9de1ac184e33d1b77 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml
@@ -63,7 +63,7 @@
         description: 'Cluster API version. Can be v1alpha1, v1alpha2 or v1alpha3.'
     - string:
         name: TARGET_NODE_OS
-        default: 'Ubuntu'
+        default: 'Centos'
         description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
@@ -86,13 +86,13 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-centos-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-centos-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
+        allow-whitelist-orgs-as-admins: False
         white-list-target-branches:
           - 'master'
           - 'release-0.3'
diff --git a/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml
index a99351017336c2af929103d5764c56663611c363..e382bf4277daa5dfed6e02f0721f301eba6fd789 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml
@@ -86,13 +86,13 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
+        allow-whitelist-orgs-as-admins: False
         white-list-target-branches:
           - 'master'
           - 'release-0.3'
diff --git a/jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml
index 2c9cc54eccefc9daed2ca3222e5fc8d605a9762b..477be11b358e679203bb4df0a7470b0214c6c5ad 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml
@@ -63,7 +63,7 @@
         description: 'Cluster API version. Can be v1alpha1, v1alpha2 or v1alpha3.'
     - string:
         name: TARGET_NODE_OS
-        default: 'Ubuntu'
+        default: 'Centos'
         description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
index 0a7f80cda1ad61b64ef62fe48927422f9d109be5..7b48b62ff414fe92f3a56ab941d8830ea5d9bcad 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
@@ -63,7 +63,7 @@
         description: 'Cluster API version. Can be v1alpha1, v1alpha2, v1alpha3 or v1alpha4.'
     - string:
         name: TARGET_NODE_OS
-        default: 'Ubuntu'
+        default: 'Centos'
         description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
@@ -86,17 +86,17 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-v1a4-centos-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a4-centos-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
+        allow-whitelist-orgs-as-admins: False
         white-list-target-branches:
           - 'master'
           - 'release-0.3'
-        status-context: "test-centos-integration"
+        status-context: "test-v1a4-centos-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
index daff766a233b73b47247bf28bb2dbe84e712a097..dc4d19b3cd9923def9e2fa1398f9b752683b27c7 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
@@ -86,13 +86,13 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '/test-v1a4-integration'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a4-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
+        allow-whitelist-orgs-as-admins: False
         white-list-target-branches:
           - 'master'
           - 'release-0.3'
diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
index 2658d0f96012d731426a44adfc14bca91c02adc2..e343c1812b222c9b58b9ce3dc7a0e24a377b6888 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
@@ -63,7 +63,7 @@
         description: 'Cluster API version. Can be v1alpha1, v1alpha2, v1alpha3 or v1alpha4.'
     - string:
         name: TARGET_NODE_OS
-        default: 'Ubuntu'
+        default: 'Centos'
         description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml
index c955bb75fd3074158f4b19249d2457be5cdc2ad0..849a9e340b7b3a35ff9cb72d86bae2a78b1d8335 100644 (file)
--- a/jjb/geode/apache-geode-test-coordinator.yaml
+++ b/jjb/geode/apache-geode-test-coordinator.yaml
@@ -99,6 +99,14 @@
               git-revision: true
               abort-all-job: true
               node-parameters: true
+# Disable ApiCheck job as the ApiCheckTest was introduced
+# in Geode 1.13 and it doesn't exist in geode 1.12
+#            - name: 'apache-geode-ApiCheckTest-jdk11'
+#              current-parameters: true
+#              git-revision: true
+#              disabled: true
+#              abort-all-job: true
+#              node-parameters: true
             - name: 'apache-geode-StressNewTest-jdk11'
               current-parameters: true
               git-revision: true
diff --git a/jjb/geode/apache-geode-test/apache-geode-acceptance-test.yaml b/jjb/geode/apache-geode-test/apache-geode-acceptance-test.yaml
index 55b157f91c1fec459a8247bf0a29cdb550e4f1f8..c00eff9e0277fb0fbd238419b0685d932289a84c 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-acceptance-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-acceptance-test.yaml
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
+# Job base on:
+# https://github.com/apache/geode/blob/develop/ci/pipelines/shared/jinja.variables.yml
 
 - project:
     name: 'apache-geode-acceptance-test'
diff --git a/jjb/geode/apache-geode-test/apache-geode-api-test.yaml b/jjb/geode/apache-geode-test/apache-geode-api-test.yaml
new file mode 100644 (file)
index 0000000..cda199f
--- /dev/null
+++ b/jjb/geode/apache-geode-test/apache-geode-api-test.yaml
@@ -0,0 +1,37 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2018-2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+# Job base on:
+# https://github.com/apache/geode/blob/develop/ci/pipelines/shared/jinja.variables.yml
+
+- project:
+    name: 'apache-geode-apicheck-test'
+    test-type: 'ApiCheck'
+    build-executor: 'apache-geode-execute-tests-macro'
+
+    artifact-slug: 'apicheck'
+    gradle-task: 'geode-assembly:japicmp'
+    java-build-version: '8'
+    java-test-version: '11'
+    parallel-gradle: 'false'
+    parallel-dunit: 'false'
+    dunit-parallel-forks: '0'
+
+    jobs:
+      - 'apache-geode-{test-type}Test-jdk{java-test-version}'
diff --git a/jjb/geode/apache-geode-test/apache-geode-distributed-test.yaml b/jjb/geode/apache-geode-test/apache-geode-distributed-test.yaml
index 23f85c2ae0fa41b22ea574ffc7c1905b127b1d90..93c6bb5e7b492ea618fbf8405c3201e594ed85c0 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-distributed-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-distributed-test.yaml
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
+# Job base on:
+# https://github.com/apache/geode/blob/develop/ci/pipelines/shared/jinja.variables.yml
 
 - project:
     name: 'apache-geode-distributed-test'
@@ -29,7 +31,7 @@
     java-test-version: '11'
     parallel-gradle: 'true'
     parallel-dunit: 'true'
-    dunit-parallel-forks: '12'
+    dunit-parallel-forks: '10'
 
     jobs:
       - 'apache-geode-{test-type}Test-jdk{java-test-version}'
diff --git a/jjb/geode/apache-geode-test/apache-geode-integration-test.yaml b/jjb/geode/apache-geode-test/apache-geode-integration-test.yaml
index 173d71eb3f787dcecaea35f35511f77d290c2518..6fe7e72a1b90019a96359bfca4d3194d987363b9 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-integration-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-integration-test.yaml
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
+# Job base on:
+# https://github.com/apache/geode/blob/develop/ci/pipelines/shared/jinja.variables.yml
 
 - project:
     name: 'apache-geode-integration-test'
diff --git a/jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml b/jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml
index 77b6084280719a00c5b147c75d2e20a0d3d77293..fe1a16ca45daa4843b9a79e88cd2ed3c6e65003f 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-stressnew-test.yaml
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
+# Job base on:
+# https://github.com/apache/geode/blob/develop/ci/pipelines/shared/jinja.variables.yml
 
 - project:
     name: 'apache-geode-stressnew-test'
diff --git a/jjb/geode/apache-geode-test/apache-geode-unit-test.yaml b/jjb/geode/apache-geode-test/apache-geode-unit-test.yaml
index 80246ebcb30ed987da7b4afcbc774e7305193cd8..fc9eb8f1483103f967e7ed328d9b94c239740216 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-unit-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-unit-test.yaml
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
+# Job base on:
+# https://github.com/apache/geode/blob/develop/ci/pipelines/shared/jinja.variables.yml
 
 - project:
     name: 'apache-geode-unit-test'
diff --git a/jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml b/jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml
index 8f9fd38f41e1f6c884b5aac89f4e29cd2dc6f89e..985030856ad7781f8e23b0f5499180904450bb58 100644 (file)
--- a/jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml
+++ b/jjb/geode/apache-geode-test/apache-geode-upgrade-test.yaml
@@ -17,6 +17,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
+# Job base on:
+# https://github.com/apache/geode/blob/develop/ci/pipelines/shared/jinja.variables.yml
 
 - project:
     name: 'apache-geode-upgrade-test'
diff --git a/jjb/geode/global-template-apache-geode-test.yaml b/jjb/geode/global-template-apache-geode-test.yaml
index 4842848a8f28d7a3c6c7b9e10f01e70dc2c02c32..a1167fee0ede5f0d9e8f0b18a262905a87a54245 100644 (file)
--- a/jjb/geode/global-template-apache-geode-test.yaml
+++ b/jjb/geode/global-template-apache-geode-test.yaml
@@ -82,6 +82,13 @@
       - workspace-cleanup:
           clean-if:
             - failure: false
+      - html-publisher:
+          name: "{test-type} HTML Report"
+          dir: "geode/build/reports/combined"
+          files: "index.html"
+          keep-all: false
+          allow-missing: true
+          link-to-last-build: false
       - notify-slack:
           slack-channel: '#geode-ci'
           notify-start: true
Management repo for Jenkins Job Builder, builder scripts and management related to the CI/CD configuration that is specific to Nordix.