Merge "Exclude tests in sonarscan"

diff --git a/INFO.yaml b/INFO.yaml
index 24a4087..ccd03db 100755 (executable)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -78,6 +78,11 @@ committers:
     id: "cromee"
     company: "samsung electronics"
     timezone: "Asia/Seoul"
+  - name: "Jackie Huang"
+    email: "jackie.huang@windriver.com"
+    id: "jackiehjm"
+    company: "Wind River"
+    timezone: "Asia/Shanghai"
 tsc:
   # yamllint disable rule:line-length
   approval: "https://wiki.o-ran-sc.org/display/TOC"

diff --git a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
index b59f294..dd1e0c5 100644 (file)
--- a/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
+++ b/jjb/aiml-fw-athp-data-extraction/aiml-fw-athp-data-extraction.yaml
@@ -12,4 +12,42 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
+
+- aiml_de_docker_common: &aiml_de_docker_common
+    # values apply to all training manager projects
+    name: aiml-fw-athp-data-extraction-docker-common
+    # git repo
+    project: aiml-fw/athp/data-extraction
+    # jenkins job name prefix
+    project-name: aiml-fw-athp-data-extraction
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-athp-data-extraction-settings
+
+- project:
+    <<: *aiml_de_docker_common
+    name: aiml-fw-athp-data-extraction-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *aiml_de_docker_common
+    name: aiml-fw-athp-data-extraction-docker
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # Dockerfile is in a subdir
+    docker-root: '.'
+    # source of docker tag
+    # dockerfile is in subdir of docker root
+    docker-build-args: '--network=host'
+    container-tag-method: yaml-file
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master

diff --git a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
index a1611e8..8eeddda 100644 (file)
--- a/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
+++ b/jjb/aiml-fw-athp-tps-kubeflow-adapter/aiml-fw-athp-tps-kubeflow-adapter.yaml
@@ -12,4 +12,42 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
+
+- aiml_kfc_docker_common: &aiml_kfc_docker_common
+    # values apply to all training manager projects
+    name: aiml-fw-athp-tps-kubeflow-adapter-docker-common
+    # git repo
+    project: aiml-fw/athp/tps/kubeflow-adapter
+    # jenkins job name prefix
+    project-name: aiml-fw-athp-tps-kubeflow-adapter
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-athp-tps-kubeflow-adapter-settings
+
+- project:
+    <<: *aiml_kfc_docker_common
+    name: aiml-fw-athp-tps-kubeflow-adapter-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *aiml_kfc_docker_common
+    name: aiml-fw-athp-tps-kubeflow-adapter-docker
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # Dockerfile is in a subdir
+    docker-root: '.'
+    # source of docker tag
+    # dockerfile is in subdir of docker root
+    docker-build-args: '--network=host'
+    container-tag-method: yaml-file
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master

diff --git a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
index 8a93a48..54d8702 100644 (file)
--- a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
+++ b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml
@@ -12,4 +12,42 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
+
+- aiml_tm_docker_common: &aiml_tm_docker_common
+    # values apply to all training manager projects
+    name: aiml-fw-awmf-tm-docker-common
+    # git repo
+    project: aiml-fw/awmf/tm
+    # jenkins job name prefix
+    project-name: aiml-fw-awmf-tm
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-awmf-tm-settings
+
+- project:
+    <<: *aiml_tm_docker_common
+    name: aiml-fw-awmf-tm-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *aiml_tm_docker_common
+    name: aiml-fw-awmf-tm-docker
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # Dockerfile is in a subdir
+    docker-root: '.'
+    # source of docker tag
+    # dockerfile is in subdir of docker root
+    docker-build-args: '--network=host'
+    container-tag-method: yaml-file
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master

diff --git a/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml b/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml
index 7befb3b..0553139 100644 (file)
--- a/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml
+++ b/jjb/portal-aiml-dashboard/portal-aiml-dashboard.yaml
@@ -12,4 +12,62 @@
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
-      - gerrit-info-yaml-verify
\ No newline at end of file
+      - gerrit-info-yaml-verify
+
+- aiml_dashboard_docker_common: &aiml_dashboard_docker_common
+    # values apply to all training manager projects
+    name: portal-aiml-dashboard-docker-common
+    # git repo
+    project: portal/aiml-dashboard
+    # jenkins job name prefix
+    project-name: portal-aiml-dashboard
+    # maven settings file has docker credentials
+    mvn-settings: portal-aiml-dashboard-settings
+
+- project:
+    <<: *aiml_dashboard_docker_common
+    name: portal-aiml-dashboard-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *aiml_dashboard_docker_common
+    name: portal-aiml-dashboard-docker
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # Dockerfile is in a subdir
+    docker-root: '.'
+    # source of docker tag
+    # dockerfile is in subdir of docker root
+    docker-build-args: '--network=host'
+    container-tag-method: yaml-file
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *aiml_dashboard_docker_common
+    name: portal-aiml-notebook-docker
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # Dockerfile is in a subdir
+    docker-root: 'kf-pipelines'
+    container-tag-yaml-dir: 'kf-pipelines'
+    # source of docker tag
+    # dockerfile is in subdir of docker root
+    docker-build-args: '--network=host'
+    container-tag-method: yaml-file
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+    stream:
+      - master:
+          branch: master
\ No newline at end of file