From 5506be428df3558793b3964819607fe3865fe492 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Mon, 12 Dec 2016 13:21:58 -0700 Subject: [PATCH] ceph-{ansible,installer}-rpm: fix config locations Our jenkins-job-builder job expects the JJB YAML to be located in a "config/definitions" directory. Add the child "definitions" directory here. --- .../config/{ => definitions}/ceph-ansible-rpm.yml | 4 ++-- .../config/{ => definitions}/ceph-installer-rpm.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename ceph-ansible-rpm/config/{ => definitions}/ceph-ansible-rpm.yml (92%) rename ceph-installer-rpm/config/{ => definitions}/ceph-installer-rpm.yml (92%) diff --git a/ceph-ansible-rpm/config/ceph-ansible-rpm.yml b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml similarity index 92% rename from ceph-ansible-rpm/config/ceph-ansible-rpm.yml rename to ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml index d0ee8ca4..7fc9c586 100644 --- a/ceph-ansible-rpm/config/ceph-ansible-rpm.yml +++ b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml @@ -35,8 +35,8 @@ builders: - shell: !include-raw: - - ../../scripts/build_utils.sh - - ../build/build + - ../../../scripts/build_utils.sh + - ../../build/build wrappers: - inject-passwords: diff --git a/ceph-installer-rpm/config/ceph-installer-rpm.yml b/ceph-installer-rpm/config/definitions/ceph-installer-rpm.yml similarity index 92% rename from ceph-installer-rpm/config/ceph-installer-rpm.yml rename to ceph-installer-rpm/config/definitions/ceph-installer-rpm.yml index de7a146e..3693c57f 100644 --- a/ceph-installer-rpm/config/ceph-installer-rpm.yml +++ b/ceph-installer-rpm/config/definitions/ceph-installer-rpm.yml @@ -35,8 +35,8 @@ builders: - shell: !include-raw: - - ../../scripts/build_utils.sh - - ../build/build + - ../../../scripts/build_utils.sh + - ../../build/build wrappers: - inject-passwords: -- 2.39.5