Merge "OSC NONRTRIC Add Jenkins jobs for test helloworld servicestub"

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/config-params.yaml
similarity index 100%
rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/config-params.yaml
rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/config-params.yaml

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/content
new file mode 100644 (file)
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/serverCredentialMappings.sandbox.yaml
new file mode 100644 (file)
index 0000000..5250c6c
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/serverCredentialMappings.yaml
similarity index 100%
rename from jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/serverCredentialMappings.yaml
rename to jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice-settings/serverCredentialMappings.yaml

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/content b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/content
deleted file mode 120000 (symlink)
index e830ebd..0000000
--- a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/content
+++ /dev/null
@@ -1 +0,0 @@
-../../../managed-config-templates/mavenSettings-content
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/serverCredentialMappings.sandbox.yaml
deleted file mode 120000 (symlink)
index 8f92057..0000000
--- a/jenkins-config/managed-config-files/mavenSettings/aiml-fw-awmf-modelmgmtservice/serverCredentialMappings.sandbox.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file

diff --git a/jjb/aiml-fw-awmf-modelmgmtservice/aiml-fw-awmf-modelmgmtservice.yaml b/jjb/aiml-fw-awmf-modelmgmtservice/aiml-fw-awmf-modelmgmtservice.yaml
new file mode 100644 (file)
index 0000000..be45f5d
--- /dev/null
+++ b/jjb/aiml-fw-awmf-modelmgmtservice/aiml-fw-awmf-modelmgmtservice.yaml
@@ -0,0 +1,52 @@
+---
+- project:
+    name: aiml-fw-awmf-modelmgmtservice-project-view
+    project-name: aiml-fw-awmf-modelmgmtservice
+    views:
+      - project-view
+
+- project:
+    name: aiml-fw-awmf-modelmgmtservice-info
+    project: aiml-fw/awmf/modelmgmtservice
+    project-name: aiml-fw-awmf-modelmgmtservice
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
+
+- _aiml-modelmgmtservice_docker_common: &aiml-modelmgmtservice_docker_common
+    name: aiml-fw-awmf-modelmgmtservice-docker-common
+    # git repo
+    project: aiml-fw/awmf/modelmgmtservice
+    # jenkins job name prefix
+    project-name: aiml-fw-awmf-modelmgmtservice
+    # maven settings file has docker credentials
+    mvn-settings: aiml-fw-awmf-modelmgmtservice-settings
+
+- project:
+    <<: *aiml-modelmgmtservice_docker_common
+    name: aiml-fw-awmf-modelmgmtservice-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-modelmgmtservice_docker_common
+    name: aiml-fw-awmf-modelmgmtservice-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