From: Jessica Wagantall Date: Wed, 23 Jun 2021 20:15:40 +0000 (+0000) Subject: Merge "Update ric-app/hw-go jjb" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=6b91a1d1073cab863a9bf081f275dcbf5e32b28b;hp=17c7ed3319891d8e10303ea46146eae878a6c282;p=ci-management.git Merge "Update ric-app/hw-go jjb" --- diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 539f4acd..987335d9 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -129,25 +129,6 @@ - cherry: branch: cherry -# nonrtric:helm-manager -# Docker image for helm-manager -- project: - <<: *nonrtric_jdk_common - name: nonrtric-helm-manager - project-name: '{name}' - mvn-params: '-f helm-manager' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'helm-manager/.*' - build-node: ubuntu1804-docker-4c-4g - jobs: - - gerrit-maven-docker-verify - - gerrit-maven-docker-merge - - gerrit-maven-docker-stage - stream: - - master: - branch: master - - project: <<: *nonrtric_jdk_common name: nonrtric-o-ru-closed-loop-recovery diff --git a/jjb/ric-app-hw-python/ric-app-hw-python.yaml b/jjb/ric-app-hw-python/ric-app-hw-python.yaml index 6e084487..e3f0fffb 100644 --- a/jjb/ric-app-hw-python/ric-app-hw-python.yaml +++ b/jjb/ric-app-hw-python/ric-app-hw-python.yaml @@ -23,6 +23,7 @@ jobs: - gerrit-info-yaml-verify +# create docker image when source changes - project: <<: *hw-python_common name: ric-app-hw-python @@ -32,8 +33,23 @@ container-tag-method: yaml-file # use host network to clone from our gerrit docker-build-args: '--network=host' + # trigger on any change other than a file in ./docs + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '^((?!docs/|\/COMMIT_MSG).)*$' jobs: - '{project-name}-gerrit-docker-jobs' stream: - master: branch: master + +# push nexus image from staging to release +- project: + <<: *hw-python_common + name: ric-app-hw-python-release + # maven release requires sigul which requires centos + # container release requires docker + build-node: centos7-docker-2c-8g + jobs: + - '{project-name}-gerrit-release-jobs' +