Merge "Fix docker context for images being built."
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Thu, 12 Nov 2020 17:42:44 +0000 (17:42 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Thu, 12 Nov 2020 17:42:44 +0000 (17:42 +0000)
jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
jjb/com-pylog/com-pylog.yaml

index 0b921ed..0106382 100644 (file)
@@ -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
index 83f2a3b..45a391f 100644 (file)
     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
     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