From 801b37db2b3be67249e67864e64e1f573b4a2a47 Mon Sep 17 00:00:00 2001 From: Rakshitha Kamath Date: Thu, 28 Mar 2024 11:33:52 +0530 Subject: [PATCH] Update jobs --- {jobs => globals/macros}/macros.yml | 4 +-- jobs/checkpatch.yml | 2 +- jobs/code_compilation.yml | 2 +- jobs/dbench.yml | 2 +- jobs/fsal_template.yml | 4 +-- jobs/labelled_nfs.yml | 1 + jobs/posix-compliance.yml | 2 +- jobs/pylint.yml | 2 +- jobs/pynfs-acl.yml | 2 +- jobs/pynfs-ceph.yml | 2 +- jobs/pynfs.yml | 2 +- jobs/storage-scale.yml | 2 +- jobs/template_iozone.yml | 2 +- jobs/trigger-cthon04-on-new-patch.yml | 37 --------------------------- jobs/trigger-tests.yml | 2 +- tests/deploy-nfs-ganesha-ci.sh | 2 +- 16 files changed, 17 insertions(+), 53 deletions(-) rename {jobs => globals/macros}/macros.yml (96%) delete mode 100644 jobs/trigger-cthon04-on-new-patch.yml diff --git a/jobs/macros.yml b/globals/macros/macros.yml similarity index 96% rename from jobs/macros.yml rename to globals/macros/macros.yml index f618820b..2fb3b4c6 100644 --- a/jobs/macros.yml +++ b/globals/macros/macros.yml @@ -13,7 +13,7 @@ - builder: name: get-node builders: - - shell: !include-raw: ../build_scripts/common/get-node.sh + - shell: !include-raw-verbatim: ../../build_scripts/common/get-node.sh - property: name: nfs-github @@ -162,7 +162,7 @@ - log-text: Build was aborted operator: OR script: - !include-raw: ../build_scripts/common/return-node.sh + !include-raw-verbatim: ../../build_scripts/common/return-node.sh - publisher: name: archive_artifacts diff --git a/jobs/checkpatch.yml b/jobs/checkpatch.yml index 2f8edf06..390ebbc1 100644 --- a/jobs/checkpatch.yml +++ b/jobs/checkpatch.yml @@ -32,7 +32,7 @@ name: GERRIT_USER builders: - - shell: !include-raw: scripts/checkpatch.sh + - shell: !include-raw-verbatim: scripts/checkpatch.sh triggers: - gerrit: diff --git a/jobs/code_compilation.yml b/jobs/code_compilation.yml index 49d9ed69..cf41c79a 100644 --- a/jobs/code_compilation.yml +++ b/jobs/code_compilation.yml @@ -32,7 +32,7 @@ builders: - get-node - - shell: !include-raw: scripts/common.sh + - shell: !include-raw-verbatim: scripts/common.sh wrappers: - gerrithub_key diff --git a/jobs/dbench.yml b/jobs/dbench.yml index feafb964..c5bb62cd 100644 --- a/jobs/dbench.yml +++ b/jobs/dbench.yml @@ -32,7 +32,7 @@ builders: - get-node - - shell: !include-raw: scripts/common.sh + - shell: !include-raw-verbatim: scripts/common.sh wrappers: - cleanup-ws diff --git a/jobs/fsal_template.yml b/jobs/fsal_template.yml index 5d41687b..4d70c258 100644 --- a/jobs/fsal_template.yml +++ b/jobs/fsal_template.yml @@ -33,11 +33,11 @@ builders: - - shell: !include-raw-escape: scripts/fsal-build.sh + - shell: !include-raw-verbatim: scripts/fsal-build.sh builders: - get-node - - shell: !include-raw-escape: scripts/fsal-build.sh + - shell: !include-raw-verbatim: scripts/fsal-build.sh triggers: - gerrithub-trigger: diff --git a/jobs/labelled_nfs.yml b/jobs/labelled_nfs.yml index e6234f6d..8dae82ef 100644 --- a/jobs/labelled_nfs.yml +++ b/jobs/labelled_nfs.yml @@ -25,6 +25,7 @@ triggers: - gerrithub-trigger: + option: 'labelled_nfs' builders: - get-node diff --git a/jobs/posix-compliance.yml b/jobs/posix-compliance.yml index 304c28fd..020db5a0 100644 --- a/jobs/posix-compliance.yml +++ b/jobs/posix-compliance.yml @@ -35,7 +35,7 @@ builders: - get-node - - shell: !include-raw: scripts/posix_compliance.sh + - shell: !include-raw-verbatim: scripts/posix_compliance.sh wrappers: - gerrithub_key diff --git a/jobs/pylint.yml b/jobs/pylint.yml index f2e011f1..f8797823 100644 --- a/jobs/pylint.yml +++ b/jobs/pylint.yml @@ -27,7 +27,7 @@ builders: - get-node - - shell: !include-raw: scripts/pylint.sh + - shell: !include-raw-verbatim: scripts/pylint.sh wrappers: - gerrithub_key diff --git a/jobs/pynfs-acl.yml b/jobs/pynfs-acl.yml index 0094c827..0cc40e31 100644 --- a/jobs/pynfs-acl.yml +++ b/jobs/pynfs-acl.yml @@ -38,7 +38,7 @@ builders: - get-node - - shell: !include-raw: scripts/common.sh + - shell: !include-raw-verbatim: scripts/common.sh triggers: - gerrithub-trigger: diff --git a/jobs/pynfs-ceph.yml b/jobs/pynfs-ceph.yml index acce0d1d..9f3c5f1a 100644 --- a/jobs/pynfs-ceph.yml +++ b/jobs/pynfs-ceph.yml @@ -35,7 +35,7 @@ builders: - get-node - - shell: !include-raw: scripts/common.sh + - shell: !include-raw-verbatim: scripts/common.sh wrappers: - gerrithub_key diff --git a/jobs/pynfs.yml b/jobs/pynfs.yml index 5b347be7..e872b7fb 100644 --- a/jobs/pynfs.yml +++ b/jobs/pynfs.yml @@ -34,7 +34,7 @@ builders: - get-node - - shell: !include-raw: scripts/common.sh + - shell: !include-raw-verbatim: scripts/common.sh wrappers: - gerrithub_key diff --git a/jobs/storage-scale.yml b/jobs/storage-scale.yml index 52cdc09d..ce2f0e16 100644 --- a/jobs/storage-scale.yml +++ b/jobs/storage-scale.yml @@ -29,7 +29,7 @@ builders: - get-node - - shell: !include-raw: scripts/common.sh + - shell: !include-raw-verbatim: scripts/common.sh wrappers: - cleanup-ws diff --git a/jobs/template_iozone.yml b/jobs/template_iozone.yml index 35c593a0..41f4ed99 100644 --- a/jobs/template_iozone.yml +++ b/jobs/template_iozone.yml @@ -44,7 +44,7 @@ builders: - get-node - - shell: !include-raw-escape: scripts/common.sh + - shell: !include-raw-verbatim: scripts/common.sh triggers: - gerrithub-trigger: diff --git a/jobs/trigger-cthon04-on-new-patch.yml b/jobs/trigger-cthon04-on-new-patch.yml deleted file mode 100644 index 15de5414..00000000 --- a/jobs/trigger-cthon04-on-new-patch.yml +++ /dev/null @@ -1,37 +0,0 @@ -- job: - name: trigger-cthon04-on-new-patch - node: cico-workspace - description: 'Start cthon04 test when a new patch is posted to GerritHub.' - project-type: freestyle - concurrent: false - allow-manual-triggers: false - - scm: - - ci-tests - - properties: - - nfs-github - - builders: - - trigger-builds: - - project: cthon04 - block: true - block-thresholds: - build-step-failure-threshold: never - unstable-threshold: never - failure-threshold: never - predefined-parameters: | - CENTOS_VERSION=8s - CENTOS_ARCH=x86_64 - GERRIT_HOST=${GERRIT_HOST} - GERRIT_PROJECT=${GERRIT_PROJECT} - GERRIT_REFSPEC=${GERRIT_REFSPEC} - - shell: | - bash $WORKSPACE/ci-tests/build_scripts/common/add-gerrit-comment.sh - - triggers: - - gerrithub-trigger: - option: 'cthon04' - - wrappers: - - gerrithub_key diff --git a/jobs/trigger-tests.yml b/jobs/trigger-tests.yml index 22bba369..ef7fa38d 100644 --- a/jobs/trigger-tests.yml +++ b/jobs/trigger-tests.yml @@ -22,7 +22,7 @@ builders: - get-node - - shell: !include-raw: scripts/tests.sh + - shell: !include-raw-verbatim: scripts/tests.sh triggers: - gerrithub-trigger: diff --git a/tests/deploy-nfs-ganesha-ci.sh b/tests/deploy-nfs-ganesha-ci.sh index 5134352b..b018dced 100755 --- a/tests/deploy-nfs-ganesha-ci.sh +++ b/tests/deploy-nfs-ganesha-ci.sh @@ -1,3 +1,3 @@ #!/bin/bash sed "s/JENKINS_API_KEY/$JENKINS_API_KEY/g" tests/jenkins.conf > jobs/jenkins.ini -jenkins-jobs --conf jobs/jenkins.ini update jobs +jenkins-jobs --conf jobs/jenkins.ini update jobs/:globals/macros/