Merge "Extend packagecloud-push for build-dir"
diff --git a/jjb/oam/oam.yaml b/jjb/oam/oam.yaml
index 0def9f4..8e40a7c 100644
--- a/jjb/oam/oam.yaml
+++ b/jjb/oam/oam.yaml
@@ -13,26 +13,37 @@
jobs:
- gerrit-info-yaml-verify
-- oam_features_common: &oam_features_common
- # project contains features of nonrtric-o1-controller
- # values apply to all projects here
- name: oam-features-common
- # git repo
+# common for all mvn jobs
+- oam_common: &oam_common
+ name: oam-common
project: oam
- # jenkins job name prefix
- project-name: oam-features
- # maven settings file has docker credentials
+ project-name: oam
mvn-settings: oam-settings
- # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
java-version: openjdk8
maven-version: mvn35
+
+# promote artifacts and images to release registries
+- project:
+ <<: *oam_common
+ name: oam-release
+ build-node: centos7-docker-2c-8g
+ jobs:
+ - '{project-name}-gerrit-release-jobs'
+
+# oam:features
+# commmon for feature artifacts for nonrtric-o1-controller
+- oam_features_common: &oam_features_common
+ name: oam-features-common
+ project-name: oam-features
mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
mvn-params: '-f features'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
pattern: 'features/.*'
+# build feature artifacts for nonrtric-o1-controller
- project:
+ <<: *oam_common
<<: *oam_features_common
name: oam-features
build-node: ubuntu1804-builder-4c-4g
@@ -45,7 +56,9 @@
- 'master':
branch: 'master'
+# report test coverage periodically for feature artifacs
- project:
+ <<: *oam_common
<<: *oam_features_common
name: oam-features-sonar
sonarcloud: true
@@ -56,35 +69,20 @@
jobs:
- gerrit-maven-sonar
-- project:
- name: oam-release
- project-name: oam
- project: oam
- mvn-settings: oam-settings
- build-node: centos7-docker-2c-8g
- jobs:
- - '{project-name}-gerrit-release-jobs'
-
+# oam:parent
+# common for feature parents for nonrtric-o1-controller feature artifacts
- oam_parent_common: &oam_parent_common
- # project contains feature parents for nonrtric-o1-controller feature bundles
- # values apply to all projects here
name: oam-parent-common
- # git repo
- project: oam
- # jenkins job name prefix
project-name: oam-parent
- # maven settings file has docker credentials
- mvn-settings: oam-settings
- # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
- java-version: openjdk8
- maven-version: mvn35
mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
mvn-params: '-f parent'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
pattern: 'parent/.*'
+# building feature parents for nonrtric-o1-controller feature artifacts
- project:
+ <<: *oam_common
<<: *oam_parent_common
name: oam-parents
build-node: ubuntu1804-builder-4c-4g
@@ -97,7 +95,9 @@
- 'master':
branch: 'master'
+# report test coverage periodically
- project:
+ <<: *oam_common
<<: *oam_parent_common
name: oam-parent-sonar
sonarcloud: true
@@ -107,3 +107,27 @@
build-node: ubuntu1604-builder-4c-4g
jobs:
- gerrit-maven-sonar
+
+# oam:distribution
+# common for oam-distribution docker projects
+- oam_distribution_common: &oam_distribution_common
+ name: oam-distribution-common
+ project-name: oam-distribution
+ mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+ mvn-params: '-f distribution -Dbuild.number=${{BUILD_NUMBER}}'
+ gerrit_trigger_file_paths:
+ - compare-type: REG_EXP
+ pattern: 'distribution/.*'
+
+# build docker images for nonrtric-o1-controller
+- project:
+ <<: *oam_common
+ <<: *oam_distribution_common
+ name: oam-distribution
+ jobs:
+ - gerrit-maven-docker-verify
+ - gerrit-maven-docker-merge
+ - gerrit-maven-docker-stage
+ stream:
+ - master:
+ branch: 'master'
diff --git a/jjb/shell/install-deb-nng-rmr.sh b/jjb/shell/install-deb-nng-rmr.sh
index c3cd175..8b472c0 100644
--- a/jjb/shell/install-deb-nng-rmr.sh
+++ b/jjb/shell/install-deb-nng-rmr.sh
@@ -65,5 +65,6 @@
wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/${deb}/download.deb
echo "Install RMR library file ${deb}"
sudo dpkg -i ${deb}
+rm -f ${deb}
echo "---> install-deb-nng-rmr.sh ends"
diff --git a/jjb/shell/install-deb-rmr3.sh b/jjb/shell/install-deb-rmr3.sh
index ef9e7e9..5749495 100644
--- a/jjb/shell/install-deb-rmr3.sh
+++ b/jjb/shell/install-deb-rmr3.sh
@@ -46,6 +46,7 @@
for deb in "rmr_${ver}_amd64.deb" "rmr-dev_${ver}_amd64.deb"; do
wget -nv --content-disposition "https://packagecloud.io/o-ran-sc/${repo}/packages/debian/stretch/${deb}/download.deb"
sudo dpkg -i "${deb}"
+ rm -f "${deb}"
done
echo "---> install-deb-rmr3.sh ends"
diff --git a/jjb/shell/install-rpm-nng-rmr.sh b/jjb/shell/install-rpm-nng-rmr.sh
index 61baea9..20ee27c 100644
--- a/jjb/shell/install-rpm-nng-rmr.sh
+++ b/jjb/shell/install-rpm-nng-rmr.sh
@@ -65,5 +65,6 @@
wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/el/5/${rpm}/download.rpm
echo "Install RMR library file ${rpm}"
sudo rpm -iv ${rpm}
+rm -f ${rpm}
echo "---> install-rpm-nng-rmr.sh ends"
diff --git a/jjb/shell/install-rpm-rmr3.sh b/jjb/shell/install-rpm-rmr3.sh
index 3970f1f..cb74bea 100644
--- a/jjb/shell/install-rpm-rmr3.sh
+++ b/jjb/shell/install-rpm-rmr3.sh
@@ -44,8 +44,9 @@
repo=${repo:-"release"}
# RPM packager adds suffix "-1" to version
for rpm in "rmr-${ver}-1.x86_64.rpm" "rmr-devel-${ver}-1.x86_64.rpm"; do
- wget -nv --content-disposition https://packagecloud.io/o-ran-sc/${repo}/packages/el/5/${rpm}/download.rpm
- sudo rpm -iv ${rpm}
+ wget -nv --content-disposition "https://packagecloud.io/o-ran-sc/${repo}/packages/el/5/${rpm}/download.rpm"
+ sudo rpm -iv "${rpm}"
+ rm -f "${rpm}"
done
echo "---> install-rpm-rmr3.sh ends"