Update jenkins jobs

See https://jira.o-ran-sc.org/browse/OAM-189 for more info

Issue-ID: OAM-189
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: Id8b1dc3ba6fd8c1d569064088004daf3e768b09d
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>

diff --git a/jjb/oam/oam.yaml b/jjb/oam/oam.yaml
index 1a9762c..5f2e337 100644 (file)
--- a/jjb/oam/oam.yaml
+++ b/jjb/oam/oam.yaml
@@ -12,122 +12,3 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-
-# common for all mvn jobs
-- oam_common: &oam_common
-    name: oam-common
-    project: oam
-    project-name: oam
-    mvn-settings: oam-settings
-    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
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - 'master':
-          branch: 'master'
-
-# report test coverage periodically for feature artifacs
-- project:
-    <<: *oam_common
-    <<: *oam_features_common
-    name: oam-features-sonar
-    sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-sonar
-
-# oam:parent
-# common for feature parents for nonrtric-o1-controller feature artifacts
-- oam_parent_common: &oam_parent_common
-    name: oam-parent-common
-    project-name: oam-parent
-    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
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - 'master':
-          branch: 'master'
-
-#  report test coverage periodically
-- project:
-    <<: *oam_common
-    <<: *oam_parent_common
-    name: oam-parent-sonar
-    sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1804-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/scp-oam-modeling/scp-oam-modeling.yaml b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
index a88461e..5d57c9a 100644 (file)
--- a/jjb/scp-oam-modeling/scp-oam-modeling.yaml
+++ b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
@@ -12,51 +12,3 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-
-- scp_oam_modeling_features_common: &scp_oam_modeling_features_common
-    # project contains model information for nonrtric-o1-controller features
-    name: scp-oam-modeling-features-common
-    project: scp/oam/modeling
-    project-name: scp-oam-modeling-features
-    mvn-settings: scp-oam-modeling-settings
-    java-version: openjdk8
-    maven-version: mvn35
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    mvn-params: '-f features'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'features/.*'
-
-- project:
-    <<: *scp_oam_modeling_features_common
-    name: scp-oam-modeling-features
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - 'master':
-          branch: 'master'
-
-- project:
-    <<: *scp_oam_modeling_features_common
-    name: scp-oam-modeling-features-sonar
-    sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-sonar
-
-- project:
-    name: scp-oam-modeling-release
-    project-name: scp-oam-modeling
-    project: scp/oam/modeling
-    mvn-settings: scp-oam-modeling-settings
-    build-node: centos7-docker-2c-8g
-    jobs:
-      - '{project-name}-gerrit-release-jobs'
-