From: Lott, Christopher (cl778h) <cl778h@att.com>
Date: Thu, 26 Mar 2020 11:04:57 +0000 (-0400)
Subject: Simplify ORAN jjb file organization
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=92475f7abfc22d0c99bf370ede1520c1443ee8f5;p=ci-management.git

Simplify ORAN jjb file organization

No functional changes just renaming:
* Rename oran-jjb to oran-templates
* Merge two shell directories and adjust usages

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I5ca746c801011385751c9b373f596cbd315d4e73
---

diff --git a/jjb/oran-jjb/oran-docker-ci-jobs.yaml b/jjb/oran-templates/oran-docker-ci-jobs.yaml
similarity index 98%
rename from jjb/oran-jjb/oran-docker-ci-jobs.yaml
rename to jjb/oran-templates/oran-docker-ci-jobs.yaml
index 8cc2b22c..be449831 100644
--- a/jjb/oran-jjb/oran-docker-ci-jobs.yaml
+++ b/jjb/oran-templates/oran-docker-ci-jobs.yaml
@@ -41,7 +41,7 @@
     name: oran-docker-build-export
     builders:
       - shell: !include-raw-escape:
-          - shell/export-packages.sh
+          - ../shell/export-packages.sh
 
 - builder:
     # {packagecloud-account} is PackageCloud account ID; example: oran
@@ -59,7 +59,7 @@
             DEBIAN_DISTRIBUTION_VERSIONS={debian-distribution-versions}
             RPM_DISTRIBUTION_VERSIONS={rpm-distribution-versions}
       - shell: !include-raw-escape:
-          - shell/packagecloud-push.sh
+          - ../shell/packagecloud-push.sh
 
 # Different name, same content as lf_docker_common
 - oran_docker_common: &oran_docker_common
diff --git a/jjb/oran-jjb/oran-shell-jobs.yaml b/jjb/oran-templates/oran-shell-jobs.yaml
similarity index 100%
rename from jjb/oran-jjb/oran-shell-jobs.yaml
rename to jjb/oran-templates/oran-shell-jobs.yaml
diff --git a/jjb/oran-jjb/shell/export-packages.sh b/jjb/shell/export-packages.sh
similarity index 100%
rename from jjb/oran-jjb/shell/export-packages.sh
rename to jjb/shell/export-packages.sh
diff --git a/jjb/oran-jjb/shell/packagecloud-push.sh b/jjb/shell/packagecloud-push.sh
similarity index 100%
rename from jjb/oran-jjb/shell/packagecloud-push.sh
rename to jjb/shell/packagecloud-push.sh