summaryrefslogtreecommitdiffstats
path: root/build-gluster-org/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'build-gluster-org/jobs')
-rw-r--r--build-gluster-org/jobs/build-job.yml2
-rw-r--r--build-gluster-org/jobs/cppcheck.yml2
-rw-r--r--build-gluster-org/jobs/gd2-smoke.yml32
-rw-r--r--build-gluster-org/jobs/glusto-tests-lint.yml2
-rw-r--r--build-gluster-org/jobs/shellcheck.yml2
-rw-r--r--build-gluster-org/jobs/smoke.yml17
6 files changed, 17 insertions, 40 deletions
diff --git a/build-gluster-org/jobs/build-job.yml b/build-gluster-org/jobs/build-job.yml
index 76015c8..2e65569 100644
--- a/build-gluster-org/jobs/build-job.yml
+++ b/build-gluster-org/jobs/build-job.yml
@@ -1,6 +1,6 @@
- job:
name: build-job
- node: smoke7
+ node: smoke8
description: Pre-commit tests for build-jobs
project-type: freestyle
diff --git a/build-gluster-org/jobs/cppcheck.yml b/build-gluster-org/jobs/cppcheck.yml
index ed25799..1957d16 100644
--- a/build-gluster-org/jobs/cppcheck.yml
+++ b/build-gluster-org/jobs/cppcheck.yml
@@ -1,6 +1,6 @@
- job:
name: cppcheck
- node: smoke7
+ node: smoke8
description: Run cppcheck analysis on gluster code
project-type: freestyle
concurrent: true
diff --git a/build-gluster-org/jobs/gd2-smoke.yml b/build-gluster-org/jobs/gd2-smoke.yml
deleted file mode 100644
index 79158c5..0000000
--- a/build-gluster-org/jobs/gd2-smoke.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- job:
- name: gd2-smoke
- node: smoke7
- description: GD2 smoke test on glusterFS patch
- project-type: freestyle
- concurrent: true
-
- scm:
- - glusterfs
-
- triggers:
- - timed: "H 14 * * *"
-
- parameters:
- - string:
- default: refs/heads/master
- description: 'For review 12345 and patch set 6, this will be refs/changes/45/12345/6. Default: Tip of master'
- name: GERRIT_REFSPEC
- - string:
- default: master
- description: 'Name of the branch you want to build from. We usually build from master'
- name: GERRIT_BRANCH
-
- builders:
- - shell: !include-raw: ../scripts/gd2-smoke.sh
-
- wrappers:
- - timestamps
- - timeout:
- timeout: 30
- abort: true
- type: absolute
diff --git a/build-gluster-org/jobs/glusto-tests-lint.yml b/build-gluster-org/jobs/glusto-tests-lint.yml
index 32bb29d..f10853f 100644
--- a/build-gluster-org/jobs/glusto-tests-lint.yml
+++ b/build-gluster-org/jobs/glusto-tests-lint.yml
@@ -1,6 +1,6 @@
- job:
name: glusto-tests-lint
- node: smoke7
+ node: smoke8
description: Pre-commit tests for glusto-tests
project-type: freestyle
concurrent: true
diff --git a/build-gluster-org/jobs/shellcheck.yml b/build-gluster-org/jobs/shellcheck.yml
index 2948e51..e7443a2 100644
--- a/build-gluster-org/jobs/shellcheck.yml
+++ b/build-gluster-org/jobs/shellcheck.yml
@@ -1,6 +1,6 @@
- job:
name: shellcheck
- node: smoke7
+ node: fedora30
description: shell script validation using ShellCheck tool
project-type: freestyle
concurrent: true
diff --git a/build-gluster-org/jobs/smoke.yml b/build-gluster-org/jobs/smoke.yml
index 045ac17..3dea6a8 100644
--- a/build-gluster-org/jobs/smoke.yml
+++ b/build-gluster-org/jobs/smoke.yml
@@ -1,6 +1,16 @@
-- job:
- name: smoke
- node: smoke7
+- project:
+ name: 'smoke'
+ nodeversion:
+ - centos7:
+ node_name: centos7
+ - centos8:
+ node_name: centos8
+ jobs:
+ - '{name}-{nodeversion}'
+
+- job-template:
+ name: '{name}-{nodeversion}'
+ node: '{node_name}'
description: Pre-commit Smoke test
project-type: freestyle
concurrent: true
@@ -57,4 +67,3 @@
- file:
credential-id: http_int_credential
variable: LOG_KEY
-