Merge "INFO.yaml: add INF project ptl to committers list"

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..2cea401 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: aaiml-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/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index e1fcfaa..443c851 100644 (file)
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -123,6 +123,7 @@
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue-enhanced-sonarqube
     python-version: python3
+    tox-dir: catalogue-enhanced
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     # do not trigger on changes in docs, releases

diff --git a/jjb/pti-rtp/upload-inf.sh b/jjb/pti-rtp/upload-inf.sh
index 4482691..7a5d10d 100644 (file)
--- a/jjb/pti-rtp/upload-inf.sh
+++ b/jjb/pti-rtp/upload-inf.sh
@@ -21,16 +21,21 @@ echo "--> upload-inf.sh"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-echo "INFO: creating virtual environment"
-virtualenv -p python3 /tmp/venv
-PATH=/tmp/venv/bin:$PATH
-
-pip_pkgs="pip setuptools lftools"
-for pkg in $pip_pkgs; do
-    cmd_pip="python -m pip install -q --upgrade $pkg"
-    echo "INFO: installing packages: $cmd_pip"
-    $cmd_pip
-done
+if [[ -f ~/lf-env.sh ]]; then
+    source ~/lf-env.sh
+    lf-activate-venv --python python3 lftools
+else
+    echo "INFO: creating virtual environment"
+    virtualenv -p python3 /tmp/venv
+    PATH=/tmp/venv/bin:$PATH
+    
+    pip_pkgs="pip setuptools lftools"
+    for pkg in $pip_pkgs; do
+        cmd_pip="python -m pip install --upgrade $pkg"
+        echo "INFO: installing packages: $cmd_pip"
+        $cmd_pip
+    done
+fi
 
 # NEXUS_URL is set by Jenkins
 nexus_repo_id="images"