Skip to content

Commit

Permalink
Update jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
Rakshitha Kamath authored and Rakshitha Kamath committed Mar 28, 2024
1 parent 05b4abf commit 801b37d
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 53 deletions.
4 changes: 2 additions & 2 deletions jobs/macros.yml → globals/macros/macros.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jobs/checkpatch.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
name: GERRIT_USER

builders:
- shell: !include-raw: scripts/checkpatch.sh
- shell: !include-raw-verbatim: scripts/checkpatch.sh

triggers:
- gerrit:
Expand Down
2 changes: 1 addition & 1 deletion jobs/code_compilation.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

builders:
- get-node
- shell: !include-raw: scripts/common.sh
- shell: !include-raw-verbatim: scripts/common.sh

wrappers:
- gerrithub_key
Expand Down
2 changes: 1 addition & 1 deletion jobs/dbench.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

builders:
- get-node
- shell: !include-raw: scripts/common.sh
- shell: !include-raw-verbatim: scripts/common.sh

wrappers:
- cleanup-ws
Expand Down
4 changes: 2 additions & 2 deletions jobs/fsal_template.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions jobs/labelled_nfs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

triggers:
- gerrithub-trigger:
option: 'labelled_nfs'

builders:
- get-node
Expand Down
2 changes: 1 addition & 1 deletion jobs/posix-compliance.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jobs/pylint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

builders:
- get-node
- shell: !include-raw: scripts/pylint.sh
- shell: !include-raw-verbatim: scripts/pylint.sh

wrappers:
- gerrithub_key
Expand Down
2 changes: 1 addition & 1 deletion jobs/pynfs-acl.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

builders:
- get-node
- shell: !include-raw: scripts/common.sh
- shell: !include-raw-verbatim: scripts/common.sh

triggers:
- gerrithub-trigger:
Expand Down
2 changes: 1 addition & 1 deletion jobs/pynfs-ceph.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

builders:
- get-node
- shell: !include-raw: scripts/common.sh
- shell: !include-raw-verbatim: scripts/common.sh

wrappers:
- gerrithub_key
Expand Down
2 changes: 1 addition & 1 deletion jobs/pynfs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

builders:
- get-node
- shell: !include-raw: scripts/common.sh
- shell: !include-raw-verbatim: scripts/common.sh

wrappers:
- gerrithub_key
Expand Down
2 changes: 1 addition & 1 deletion jobs/storage-scale.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

builders:
- get-node
- shell: !include-raw: scripts/common.sh
- shell: !include-raw-verbatim: scripts/common.sh

wrappers:
- cleanup-ws
Expand Down
2 changes: 1 addition & 1 deletion jobs/template_iozone.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

builders:
- get-node
- shell: !include-raw-escape: scripts/common.sh
- shell: !include-raw-verbatim: scripts/common.sh

triggers:
- gerrithub-trigger:
Expand Down
37 changes: 0 additions & 37 deletions jobs/trigger-cthon04-on-new-patch.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion jobs/trigger-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

builders:
- get-node
- shell: !include-raw: scripts/tests.sh
- shell: !include-raw-verbatim: scripts/tests.sh

triggers:
- gerrithub-trigger:
Expand Down
2 changes: 1 addition & 1 deletion tests/deploy-nfs-ganesha-ci.sh
View file
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit 801b37d

Please sign in to comment.