X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foran-templates%2Foran-docker-ci-jobs.yaml;h=93c431bc011546374add6668df5a262480820cd7;hb=refs%2Fheads%2Fmaster;hp=be4498312f0e8c7aed6d77862c9b3394c238adcc;hpb=ac914993447938b9c58d6470a33a44696581248f;p=ci-management.git

diff --git a/jjb/oran-templates/oran-docker-ci-jobs.yaml b/jjb/oran-templates/oran-docker-ci-jobs.yaml
index be449831..55f3f25e 100644
--- a/jjb/oran-templates/oran-docker-ci-jobs.yaml
+++ b/jjb/oran-templates/oran-docker-ci-jobs.yaml
@@ -15,24 +15,13 @@
 #   limitations under the License.
 
 # Macros and templates for using Docker as the CI system.
+
 # The merge template calls builders to build in docker,
 # export files, then push to PackageCloud.
 # The docker image is discarded, not pushed to a registry.
 # Uses builders defined in, and mirrors the structure of,
 # global-jjb resource jjb/lf-docker-jobs.yaml
 
-- builder:
-    name: oran-packagecloud-file-provider
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: ".packagecloud"
-              target: "$HOME/.packagecloud"
-      - config-file-provider:
-          files:
-            - file-id: "packagecloud_api"
-              target: "$HOME/packagecloud_api"
-
 # This shell script launches the container, which copies
 # build products to a mounted volume.  Script needs vars
 # CONTAINER_PUSH_REGISTRY, DOCKER_NAME and DOCKER_IMAGE_TAG
@@ -43,26 +32,8 @@
       - shell: !include-raw-escape:
           - ../shell/export-packages.sh
 
-- builder:
-    # {packagecloud-account} is PackageCloud account ID; example: oran
-    # {packagecloud-repo} is PackageCloud repository; example: master, staging
-    # {debian-distribution-versions} is list of DEB package distro/version strings
-    #    separated by space; example: ubuntu/bionic debian/stretch
-    # {rpm-distribution-versions} is list of RPM package distro/version strings
-    #    separated by space; example: el/4 el/5
-    name: oran-packagecloud-push
-    builders:
-      - inject:
-          properties-content: |
-            PACKAGECLOUD_ACCOUNT={packagecloud-account}
-            PACKAGECLOUD_REPO={packagecloud-repo}
-            DEBIAN_DISTRIBUTION_VERSIONS={debian-distribution-versions}
-            RPM_DISTRIBUTION_VERSIONS={rpm-distribution-versions}
-      - shell: !include-raw-escape:
-          - ../shell/packagecloud-push.sh
-
 # Different name, same content as lf_docker_common
-- oran_docker_common: &oran_docker_common
+- _oran_docker_common: &oran_docker_common
     name: oran-docker-ci-common
 
     project-type: freestyle
@@ -113,7 +84,7 @@
     publishers:
       - lf-infra-publish
 
-- oran_docker_ci_pc_merge_common: &oran_docker_ci_pc_merge_common
+- _oran_docker_ci_pc_merge_common: &oran_docker_ci_pc_merge_common
     name: oran-docker-ci-pc-merge-common
     cron: ""
 
@@ -161,6 +132,7 @@
       - shell: "{post_docker_build_script}"
       - oran-docker-build-export
       - oran-packagecloud-push:
+          build-dir: export-packages # directory with deb/rpm files
           packagecloud-account: "{packagecloud-account}"
           packagecloud-repo: "{packagecloud-repo}"
           debian-distribution-versions: "{debian-distribution-versions}"