From: Jessica Wagantall Date: Thu, 12 Nov 2020 17:42:44 +0000 (+0000) Subject: Merge "Fix docker context for images being built." X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=d1c41b93aa4e6425a64c6cc60e995cb1bd554124;hp=3585eb3f817617a3f9f112b28911132296a40a5f;p=ci-management.git Merge "Fix docker context for images being built." --- diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg index 0b921edd..0106382e 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg @@ -1,4 +1,4 @@ -LABELS=centos7-builder-1c-1g IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200317-165605.039 -VOLUME_SIZE=20 +LABELS=centos7-builder-1c-1g HARDWARE_ID=v2-highcpu-1 +VOLUME_SIZE=20 diff --git a/jjb/com-pylog/com-pylog.yaml b/jjb/com-pylog/com-pylog.yaml index 83f2a3b8..45a391fb 100644 --- a/jjb/com-pylog/com-pylog.yaml +++ b/jjb/com-pylog/com-pylog.yaml @@ -30,6 +30,15 @@ name: pylog-pypi # the code is in a subdirectory tox-dir: mdclogpy + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'mdclogpy/.*' + stream: + - master: + branch: master + jobs: + - gerrit-pypi-verify + - gerrit-pypi-stage - project: <<: *pylog_common @@ -43,15 +52,6 @@ build-node: centos7-docker-2c-8g # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'mdclogpy/.*' - stream: - - master: - branch: master - jobs: - - gerrit-pypi-verify - - gerrit-pypi-stage - pylog_python: &pylog_python # settings for python builds