From: Jamo Luhrsen Date: Fri, 23 Feb 2018 20:42:57 +0000 (+0000) Subject: Merge "Don't allow retry to fail stacking" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f2bb753ca34b150523d364b84618075edc6dd6f4;hp=89a0003414c9a0e8e1e5bdd14ee0df9e26a10a9b;p=releng%2Fbuilder.git Merge "Don't allow retry to fail stacking" --- diff --git a/.coafile b/.coafile index 47cf0afb0..f087a8e75 100644 --- a/.coafile +++ b/.coafile @@ -31,6 +31,7 @@ files = **.sh ignore = .git/**, .tox/**, jjb/global-jjb/**, + jenkins-config/**, jenkins-scripts/*-local-env.sh shell = bash indent_size = 4 diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst index af06a9ef9..001b71016 100644 --- a/docs/cloud-images.rst +++ b/docs/cloud-images.rst @@ -1,12 +1,15 @@ Following are the list of published images available to be used with Jenkins jobs. +* ZZCI - CentOS 7 - autorelease - 20180125-2240 * ZZCI - CentOS 7 - builder - 20180109-0417 +* ZZCI - CentOS 7 - builder - 20180110-1659 * ZZCI - CentOS 7 - builder - 20180201-2139 * ZZCI - CentOS 7 - devstack - 20171208-1648 * ZZCI - CentOS 7 - devstack-ocata - 20171208-1649 * ZZCI - CentOS 7 - devstack-pike - 20171208-1649 * ZZCI - CentOS 7 - docker - 20171209-0317 * ZZCI - CentOS 7 - docker - 20180109-0346 +* ZZCI - CentOS 7 - docker - 20180110-1659 * ZZCI - CentOS 7 - java-builder - 20171206-1842 * ZZCI - CentOS 7 - java-builder - 20171209-0032 * ZZCI - CentOS 7 - robot - 20171207-1911 diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh new file mode 100644 index 000000000..83b3cb51f --- /dev/null +++ b/jenkins-config/global-vars-releng.sh @@ -0,0 +1,9 @@ +GERRIT_URL=https://git.opendaylight.org/gerrit +GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT +GIT_URL=git://devvexx.opendaylight.org/mirror +JENKINS_HOSTNAME=vex-yul-odl-jenkins-1 +LOGS_SERVER=https://logs.opendaylight.org +NEXUS_URL=https://nexus.opendaylight.org +ODLNEXUSPROXY=https://nexus.opendaylight.org +SILO=releng +SONAR_URL=https://sonar.opendaylight.org diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh new file mode 100644 index 000000000..62de193e3 --- /dev/null +++ b/jenkins-config/global-vars-sandbox.sh @@ -0,0 +1,9 @@ +GERRIT_URL=https://git.opendaylight.org/gerrit +GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT +GIT_URL=git://devvexx.opendaylight.org/mirror +JENKINS_HOSTNAME=vex-yul-odl-jenkins-2 +LOGS_SERVER=https://logs.opendaylight.org +NEXUS_URL=https://nexus.opendaylight.org +ODLNEXUSPROXY=https://nexus.opendaylight.org +SILO=sandbox +SONAR_URL=https://sonar.opendaylight.org diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh index e79228f33..3309b00ab 100755 --- a/jenkins-scripts/jenkins-init-script.sh +++ b/jenkins-scripts/jenkins-init-script.sh @@ -24,3 +24,9 @@ source /tmp/system_type.sh ## add local environment changes post scripts ./jenkins-init-script-local-env.sh + +# Create a swap file +dd if=/dev/zero of=/swap count=1024 bs=1MiB +chmod 600 /swap +mkswap /swap +swapon /swap diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 0d307f7ab..9ce1c94c5 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -3,7 +3,6 @@ name: aaa-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9318cf3c82c33 @@ -23,7 +21,6 @@ name: aaa-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9318cf3c82c33 @@ -43,7 +39,6 @@ name: aaa-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9318cf3c82c33 diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index a2888bcd7..d1085a28f 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -3,7 +3,6 @@ name: alto-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' - archive-artifacts: '' # Used by the release job staging-profile-id: 931eabae9693c @@ -24,7 +22,6 @@ name: alto-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -36,7 +33,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' - archive-artifacts: '' # Used by the release job staging-profile-id: 931eabae9693c @@ -45,7 +41,6 @@ name: alto-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -58,7 +53,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' - archive-artifacts: '' # Used by the release job staging-profile-id: 931eabae9693c diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 24207d711..447d85160 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -3,7 +3,6 @@ name: atrium-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9324f12310e6a @@ -23,7 +21,6 @@ name: atrium-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9324f12310e6a @@ -43,7 +39,6 @@ name: atrium-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9324f12310e6a diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index e8d9cae84..06daa22d2 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -149,7 +149,7 @@ - builder: name: autorelease-update-validate-projects builders: - - shell: !include-raw-escape: update-validate-autorelease-projects.sh + - shell: !include-raw: update-validate-autorelease-projects.sh - publisher: # Search console log for failures and email status to the release mailing list. diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 6ba9f0ed5..9e6bc1e47 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -6,7 +6,8 @@ - 'autorelease-release-{stream}': build-node: centos7-autorelease-4c-16g - 'autorelease-update-validate-jobs-{stream}' - - 'autorelease-version-bump-{stream}' + - 'autorelease-version-bump-{stream}': + build-node: centos7-autorelease-4c-16g - '{project-name}-validate-autorelease-{stream}' - gerrit-tox-verify diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index b36b7a57f..94141d552 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -154,7 +154,7 @@ - job-template: name: autorelease-update-validate-jobs-{stream} project-type: freestyle - node: centos7-builder-2c-8g + node: centos7-builder-2c-1g properties: - lf-infra-properties: @@ -212,7 +212,7 @@ - job-template: name: autorelease-version-bump-{stream} project-type: freestyle - node: centos7-builder-4c-16g + node: '{build-node}' properties: - opendaylight-infra-properties: @@ -348,6 +348,8 @@ disabled: false project-type: freestyle + # Note: This NEEDS to be hardcoded as projects should NOT be allowed to + # override the build node. node: centos7-builder-2c-8g concurrent: true jdk: '{java-version}' diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml index 475780867..4a4f99a49 100644 --- a/jjb/autorelease/validate-autorelease-oxygen.yaml +++ b/jjb/autorelease/validate-autorelease-oxygen.yaml @@ -25,10 +25,6 @@ project: dlux - dluxapps: project: dluxapps - - eman: - project: eman - - faas: - project: faas - genius: project: genius - groupbasedpolicy: @@ -39,6 +35,8 @@ project: infrautils - integration-distribution: project: integration/distribution + - jsonrpc: + project: jsonrpc - l2switch: project: l2switch - lispflowmapping: @@ -53,8 +51,6 @@ project: netvirt - neutron: project: neutron - - nic: - project: nic - of-config: project: of-config - openflowplugin: @@ -73,9 +69,7 @@ project: snmp4sdn - sxp: project: sxp - - unimgr: - project: unimgr + - tsdr: + project: tsdr - usc: project: usc - - vtn: - project: vtn diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 2a4168e93..5c8ee1da2 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -3,7 +3,6 @@ name: bgpcep-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -22,7 +21,6 @@ mdsal-merge-{stream}, tcpmd5-merge-{stream} email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9427a05049030 @@ -31,7 +29,6 @@ name: bgpcep-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -50,7 +47,6 @@ mdsal-merge-{stream}, tcpmd5-merge-{stream} email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9427a05049030 @@ -59,7 +55,6 @@ name: bgpcep-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -79,7 +74,6 @@ mdsal-merge-{stream}, tcpmd5-merge-{stream} email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - archive-artifacts: '' # Used by the release job staging-profile-id: 9427a05049030 diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 4f007654a..3dd2638f4 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -3,7 +3,6 @@ name: bier-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -16,7 +15,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' - archive-artifacts: '' # Used by the release job staging-profile-id: 942a8075b1f2a @@ -25,7 +23,6 @@ name: bier-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -37,7 +34,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' - archive-artifacts: '' # Used by the release job staging-profile-id: 942a8075b1f2a @@ -46,7 +42,6 @@ name: bier-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -59,7 +54,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' - archive-artifacts: '' # Used by the release job staging-profile-id: 942a8075b1f2a diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index bf5f301d1..e6fdae199 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -3,7 +3,6 @@ name: capwap-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96bd6b5bf86e3 @@ -23,7 +21,6 @@ name: capwap-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96bd6b5bf86e3 @@ -43,7 +39,6 @@ name: capwap-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96bd6b5bf86e3 diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 8962ee482..71b99503d 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -3,7 +3,6 @@ name: cardinal-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96be20348f0f2 @@ -23,7 +21,6 @@ name: cardinal-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96be20348f0f2 @@ -43,7 +39,6 @@ name: cardinal-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96be20348f0f2 diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index b96d01da8..a9beae82d 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -3,7 +3,6 @@ name: centinel-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96bf9b3fefd8a @@ -23,7 +21,6 @@ name: centinel-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96bf9b3fefd8a @@ -43,7 +39,6 @@ name: centinel-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96bf9b3fefd8a diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 4740ba10f..290f29cf8 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -3,7 +3,6 @@ name: coe-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'coe' @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96c0be46aac33 @@ -23,7 +21,6 @@ name: coe-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'coe' @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96c0be46aac33 @@ -42,7 +38,6 @@ - project: name: coe-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'coe' @@ -54,7 +49,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96c0be46aac33 diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 79d595d87..8683803c4 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -3,7 +3,6 @@ name: controller-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -18,7 +17,6 @@ build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96c1c9177efdd @@ -27,7 +25,6 @@ name: controller-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -41,7 +38,6 @@ build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96c1c9177efdd @@ -50,7 +46,6 @@ name: controller-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -65,7 +60,6 @@ build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96c1c9177efdd diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index dfd6205f1..8ffa7a99d 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -2,7 +2,6 @@ - project: name: coretutorials-oxygen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -13,7 +12,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' - archive-artifacts: '' build-timeout: 120 # Used by the release job @@ -22,7 +20,6 @@ - project: name: coretutorials-nitrogen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -33,7 +30,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' - archive-artifacts: '' build-timeout: 120 # Used by the release job @@ -42,7 +38,6 @@ - project: name: coretutorials-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -54,7 +49,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' - archive-artifacts: '' build-timeout: 120 # Used by the release job diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 49b7f4051..25f05ee88 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -3,7 +3,6 @@ name: daexim-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'daexim' @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e4dade34bd7 @@ -23,7 +21,6 @@ name: daexim-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'daexim' @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e4dade34bd7 diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index c54a7e8bf..037ebc6be 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -3,7 +3,6 @@ name: didm-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6338c870f5 @@ -23,7 +21,6 @@ name: didm-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6338c870f5 @@ -43,7 +39,6 @@ name: didm-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6338c870f5 diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index fbd47780c..d090eebea 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -3,7 +3,6 @@ name: dlux-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6a0327484f @@ -23,7 +21,6 @@ name: dlux-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6a0327484f @@ -43,7 +39,6 @@ name: dlux-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6a0327484f diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 3ca8015d0..d87fdb4c7 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -3,7 +3,6 @@ name: dluxapps-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'dluxapps' @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6fb1e65bf9 @@ -24,7 +22,6 @@ name: dluxapps-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'dluxapps' @@ -36,7 +33,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6fb1e65bf9 @@ -45,7 +41,6 @@ name: dluxapps-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'dluxapps' @@ -58,7 +53,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96e6fb1e65bf9 diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 6a1c96748..e6461e14c 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -18,4 +18,3 @@ build-node: centos7-builder-2c-8g build-timeout: 30 rtd-project: opendaylight - archive-artifacts: '' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index e2c75d2e1..d36e97ec2 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -3,7 +3,6 @@ name: eman-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' - archive-artifacts: '' build-node: centos7-builder-4c-16g # Used by the release job @@ -25,7 +23,6 @@ name: eman-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -37,7 +34,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' - archive-artifacts: '' build-node: centos7-builder-4c-16g # Used by the release job @@ -47,7 +43,6 @@ name: eman-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -60,7 +55,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' - archive-artifacts: '' build-node: centos7-builder-4c-16g # Used by the release job diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index cd16b5827..c3e95b813 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -3,7 +3,6 @@ name: faas-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96f5ac591d858 @@ -23,7 +21,6 @@ name: faas-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96f5ac591d858 @@ -43,7 +39,6 @@ name: faas-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96f5ac591d858 diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index d680b128f..37d11172b 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -3,7 +3,6 @@ name: federation-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96f78c7a40a24 @@ -24,7 +22,6 @@ name: federation-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -36,7 +33,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96f78c7a40a24 @@ -45,7 +41,6 @@ name: federation-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -58,7 +53,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96f78c7a40a24 diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index fea7ca035..1d64f2e5d 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -1,12 +1,9 @@ --- - project: - name: genius-csit-genius + name: genius-csit-genius-oxygen jobs: - inttest-csit-1node - inttest-csit-3node - - inttest-csit-verify-1node - - inttest-csit-verify-3node - # The project name project: 'genius' @@ -23,6 +20,39 @@ stream: - oxygen: branch: 'master' + install: + - all: + scope: 'all' + + # Mininet configuration + tools_system_count: 3 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 + + # Features to install + install-features: 'odl-genius-rest' + + # Robot custom options + robot-options: ' ' + +- project: + name: genius-csit-genius-{stream} + jobs: + - inttest-csit-1node + - inttest-csit-3node + - inttest-csit-verify-1node + - inttest-csit-verify-3node + + + # The project name + project: 'genius' + + # The functionality under test + functionality: + - 'upstream' + - 'gate' + + # Project branches + stream: - nitrogen: branch: 'stable/nitrogen' - carbon: diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 5fdd19fa3..2bd0758bf 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -3,7 +3,6 @@ name: genius-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -22,7 +21,6 @@ openflowplugin-merge-{stream}, neutron-merge-{stream} email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fb4b6d9d1ee @@ -31,7 +29,6 @@ name: genius-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -48,7 +45,6 @@ openflowplugin-merge-{stream}, neutron-merge-{stream} email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fb4b6d9d1ee @@ -57,7 +53,6 @@ name: genius-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -75,7 +70,6 @@ openflowplugin-merge-{stream}, neutron-merge-{stream} email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fb4b6d9d1ee diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index a7eb0f205..70c32643c 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -3,7 +3,6 @@ name: groupbasedpolicy-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -22,7 +21,6 @@ sfc-merge-{stream}, ovsdb-merge-{stream} email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fbb93f95a76 @@ -31,7 +29,6 @@ name: groupbasedpolicy-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -49,7 +46,6 @@ sfc-merge-{stream}, ovsdb-merge-{stream} email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fbb93f95a76 @@ -58,7 +54,6 @@ name: groupbasedpolicy-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -77,7 +72,6 @@ sfc-merge-{stream}, ovsdb-merge-{stream} email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fbb93f95a76 diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 4d3c545a3..f2e35f98a 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -3,7 +3,6 @@ name: vbd-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fc362c36862 @@ -23,7 +21,6 @@ name: vbd-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fc362c36862 @@ -43,7 +39,6 @@ name: vbd-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fc362c36862 diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 77dfce739..8ebb62990 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -3,7 +3,6 @@ name: infrautils-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fca0367756c @@ -24,7 +22,6 @@ name: infrautils-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -35,7 +32,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fca0367756c @@ -44,7 +40,6 @@ name: infrautils-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -56,7 +51,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fca0367756c diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index 451bb20c4..d7108c9a5 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -126,7 +126,7 @@ function install_openstack_clients_in_robot_vm() { if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then #networking-l2gw is not officially available in any release yet. Gettting the latest stable version. - $PYTHON -m pip install networking-l2gw + $PYTHON -m pip install networking-l2gw==11.0.0 fi } @@ -844,8 +844,10 @@ CORE_OS_CONTROL_SERVICES+=",odl-compute,odl-neutron" # Additional services CORE_OS_CONTROL_SERVICES+=",mysql,rabbit" +# collect performance stats +CORE_OS_COMPUTE_SERVICES="dstat" # computes only need nova and odl -CORE_OS_COMPUTE_SERVICES="n-cpu,odl-compute" +CORE_OS_COMPUTE_SERVICES+=",n-cpu,odl-compute" cat > ${WORKSPACE}/disable_firewall.sh << EOF sudo systemctl stop firewalld @@ -1188,10 +1190,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24; sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0; " - # Control Node - set VXLAN TEP IP for Genius Auto TZ - ${SSH} ${!CONTROLIP} " - sudo ovs-vsctl set O . external_ids:tep-ip=${!CONTROLIP}; - " # Control Node - external net internet address simulation ${SSH} ${!CONTROLIP} " @@ -1296,14 +1294,19 @@ echo "Starting Robot test suites ${SUITES} ..." # please add pybot -v arguments on a single line and alphabetized suite_num=0 for suite in ${SUITES}; do - # prepend a incrmental counter to the suite name so that the full robot log combining all the suites as is done - # in the rebot step below will list all the suites in chronological order as rebot seems to alphabatize them + # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done + # in the rebot step below will list all the suites in chronological order as rebot seems to alphabetize them let "suite_num = suite_num + 1" suite_index="$(printf %02d ${suite_num})" suite_name="$(basename ${suite} | cut -d. -f1)" log_name="${suite_index}_${suite_name}" - pybot -N ${log_name} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \ + pybot -N ${log_name} \ + -c critical -e exclude -e skip_if_${DISTROSTREAM} \ --log log_${log_name}.html --report None --output output_${log_name}.xml \ + --removekeywords wuks \ + --removekeywords name:SetupUtils.Setup_Utils_For_Setup_And_Teardown \ + --removekeywords name:SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing \ + --removekeywords name:OpenStackOperations.Add_OVS_Logging_On_All_OpenStack_Nodes \ -v BUNDLEFOLDER:${BUNDLEFOLDER} \ -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \ -v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \ diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 4f158f1cd..ed5b2d0aa 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -3,7 +3,6 @@ name: iotdm-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fd6e9453970 @@ -24,7 +22,6 @@ name: iotdm-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -36,7 +33,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fd6e9453970 @@ -45,7 +41,6 @@ name: iotdm-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -58,7 +53,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fd6e9453970 diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index be8341ee3..033d8978d 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -2,7 +2,6 @@ - project: name: jsonrpc-fluorine jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'jsonrpc' @@ -13,7 +12,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fdf4408765d @@ -22,7 +20,6 @@ name: jsonrpc-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'jsonrpc' @@ -33,7 +30,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fdf4408765d @@ -41,7 +37,6 @@ - project: name: jsonrpc-nitrogen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'jsonrpc' @@ -52,7 +47,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fdf4408765d @@ -60,7 +54,6 @@ - project: name: jsonrpc-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'jsonrpc' @@ -72,7 +65,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fdf4408765d diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 3cb1e9378..6e1af41fb 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -3,7 +3,6 @@ name: l2switch-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -19,7 +18,6 @@ openflowjava-merge-{stream}, openflowplugin-merge-{stream} email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fee85953ca0 @@ -28,7 +26,6 @@ name: l2switch-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -44,7 +41,6 @@ openflowjava-merge-{stream}, openflowplugin-merge-{stream} email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fee85953ca0 @@ -53,7 +49,6 @@ name: l2switch-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -70,7 +65,6 @@ openflowjava-merge-{stream}, openflowplugin-merge-{stream} email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96fee85953ca0 diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 194a76145..49d043cb7 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -3,7 +3,6 @@ name: lacp-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96ff6c0ff6ab1 @@ -23,7 +21,6 @@ name: lacp-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96ff6c0ff6ab1 @@ -43,7 +39,6 @@ name: lacp-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: 96ff6c0ff6ab1 diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml index c94f79b3e..3d83608ce 100644 --- a/jjb/lf-infra/lf-infra-jobs.yaml +++ b/jjb/lf-infra/lf-infra-jobs.yaml @@ -1,4 +1,19 @@ --- +- project: + name: lf-infra-ansible-roles-system-update + jobs: + - gerrit-tox-verify + + project-name: lf-infra-ansible-roles + project: ansible/roles/* + build-node: ubuntu1604-docker-2c-2g + build-timeout: 60 + stream: any + branch: '*' + + git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT + gerrit-server-name: LinuxFoundation + - project: name: lf-infra-ci-workshop jobs: @@ -110,3 +125,17 @@ git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT gerrit-server-name: LinuxFoundation + +- project: + name: lf-infra-license-checker + jobs: + - gerrit-tox-verify + + project-name: lf-infra-license-checker + project: releng/license-checker + build-node: centos7-builder-2c-2g + stream: any + branch: '*' + + git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT + gerrit-server-name: LinuxFoundation diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index ef1596ae9..4e7518c27 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -3,7 +3,6 @@ name: lispflowmapping-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -29,7 +28,6 @@ name: lispflowmapping-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -55,7 +53,6 @@ name: lispflowmapping-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -69,7 +66,6 @@ mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' - archive-artifacts: '' build-node: centos7-builder-8c-8g # Used by the release job diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index e383c3c15..7490dd565 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-distribution-check-{stream}': mvn-version: 'mvn35' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -19,7 +18,6 @@ build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[mdsal] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a674173c7b29d @@ -28,7 +26,6 @@ name: mdsal-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -42,7 +39,6 @@ mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[mdsal] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a674173c7b29d @@ -51,7 +47,6 @@ name: mdsal-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -66,7 +61,6 @@ mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[mdsal] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a674173c7b29d diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 4c928c39b..14c273883 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -3,7 +3,6 @@ name: messaging4transport-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' - archive-artifacts: '' # Used by the release job staging-profile-id: a677283157db4 @@ -24,7 +22,6 @@ name: messaging4transport-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -36,7 +33,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' - archive-artifacts: '' # Used by the release job staging-profile-id: a677283157db4 @@ -45,7 +41,6 @@ name: messaging4transport-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -58,7 +53,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' - archive-artifacts: '' # Used by the release job staging-profile-id: a677283157db4 diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index b40529213..3b948fca6 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -3,7 +3,6 @@ name: natapp-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: a679c0f4f08a8 @@ -24,7 +22,6 @@ name: natapp-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -36,7 +33,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: a679c0f4f08a8 @@ -45,7 +41,6 @@ name: natapp-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -58,7 +53,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: a679c0f4f08a8 diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 3a9c047e2..af23ab6fd 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -3,7 +3,6 @@ name: nemo-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67a9890f6202 @@ -23,7 +21,6 @@ name: nemo-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67a9890f6202 @@ -43,7 +39,6 @@ name: nemo-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67a9890f6202 diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index a476c155d..e12d7bb25 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -3,7 +3,6 @@ name: netconf-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -17,7 +16,6 @@ build-timeout: 90 dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67b22fc3663f @@ -26,7 +24,6 @@ name: netconf-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -39,7 +36,6 @@ mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67b22fc3663f @@ -48,7 +44,6 @@ name: netconf-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -62,7 +57,6 @@ mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67b22fc3663f diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 9952388a7..abc54479c 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -3,7 +3,6 @@ name: netide-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67bab3755815 @@ -23,7 +21,6 @@ name: netide-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67bab3755815 @@ -43,7 +39,6 @@ name: netide-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67bab3755815 diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index a4143f9aa..88d6a4a42 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -7,28 +7,35 @@ project: 'netvirt' stream: 'oxygen' branch: 'master' + testplan: '{project}-{topology}-l2gw-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 + tools_system_count: 2 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 + + # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled + enable-networking-l2gw: 'yes' topology: - 1node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' - 3node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 3 enable-haproxy: 'yes' install-features: 'odl-jolokia,odl-netvirt-openstack' - testplan: '{project}-{topology}-l2gw-openstack.txt' - functionality: - - upstream-stateful: - sg-mode: 'stateful' - - gate-stateful: - sg-mode: 'stateful' + - upstream-stateful + - gate-stateful openstack: - ocata: @@ -51,16 +58,6 @@ openstack_system_image: '{openstack_system_image_pike}' openstack_system2_image: '{openstack_system_image_pike}' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,l2gw-plugin' - enable-openstack-compute-services: 'placement-client' - security-group-mode: '{sg-mode}' - tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' - - project: name: netvirt-csit-hwvtep-openstack-integration-nitrogen jobs: @@ -69,30 +66,35 @@ project: 'netvirt' stream: 'nitrogen' branch: 'stable/nitrogen' + testplan: '{project}-{topology}-l2gw-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 + tools_system_count: 2 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 + + # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled + enable-networking-l2gw: 'yes' topology: - 1node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' - 3node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 3 enable-haproxy: 'yes' install-features: 'odl-jolokia,odl-netvirt-openstack' - testplan: '{project}-{topology}-l2gw-openstack.txt' - functionality: - - upstream-stateful: - schedule: '' - sg-mode: 'stateful' - - gate-stateful: - schedule: '' - sg-mode: 'stateful' + - upstream-stateful + - gate-stateful openstack: - ocata: @@ -115,50 +117,44 @@ openstack_system_image: '{openstack_system_image_pike}' openstack_system2_image: '{openstack_system_image_pike}' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,l2gw-plugin' - enable-openstack-compute-services: 'placement-client' - security-group-mode: '{sg-mode}' - tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' - - project: name: netvirt-csit-hwvtep-openstack-integration-carbon jobs: - inttest-csit-hwvtep-openstack project: 'netvirt' - stream: 'carbon' branch: 'stable/carbon' karaf-version: karaf3 + testplan: '{project}-{topology}-l2gw-openstack.txt' + odl-ml2-driver-version: 'v2' + enable-openstack-services: 'placement-api,l2gw-plugin' + enable-openstack-compute-services: 'placement-client' + security-group-mode: 'stateful' + odl_system_flavor: v2-standard-8 + openstack_system_flavor: v2-standard-8 + openstack_system2_flavor: v2-standard-4 + tools_system_count: 2 + tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 + + # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled + enable-networking-l2gw: 'yes' topology: - 1node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' - 3node: - openstack_system1_count: 1 openstack_system2_count: 1 odl_system_count: 3 enable-haproxy: 'yes' install-features: 'odl-jolokia,odl-netvirt-openstack' - testplan: '{project}-{topology}-l2gw-openstack.txt' - functionality: - - upstream-stateful: - schedule: '' - sg-mode: 'stateful' - - gate-stateful: - schedule: '' - sg-mode: 'stateful' + - upstream-stateful + - gate-stateful openstack: - ocata: @@ -174,13 +170,3 @@ openstack_system_image: '{openstack_system_image_pike}' openstack_system2_image: '{openstack_system_image_pike}' enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,l2gw-plugin' - enable-openstack-compute-services: 'placement-client' - security-group-mode: '{sg-mode}' - tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index db97acfc2..61b562eb0 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -38,7 +38,7 @@ - gate-minimal-cluster: testplan: '{project}-{topology}-minimal-openstack.txt' # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - - tdd-wip: + - gate-tdd-wip: testplan: '{project}-{topology}-tdd-wip-openstack.txt' schedule: '' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 0d6c3e239..dd876aed2 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -49,4 +49,4 @@ netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream} - tdd-wip: csit-list: > - netvirt-csit-1node-openstack-{os-branch}-tdd-wip-{stream} + netvirt-csit-1node-openstack-{os-branch}-gate-tdd-wip-{stream} diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 22867d5f7..f172ba17f 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -3,7 +3,6 @@ name: netvirt jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - gerrit-tox-verify - odl-maven-jobs @@ -30,7 +29,6 @@ ovsdb-merge-{stream}, sfc-merge-{stream} email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67da0ffbb1ba @@ -50,7 +48,6 @@ mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' dependencies: email-upstream: '[netvirt]' - archive-artifacts: '' - project: name: netvirt-sonar diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index b56980226..9c1c89196 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -3,7 +3,6 @@ name: neutron-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -16,7 +15,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67e1b40d7419 @@ -25,7 +23,6 @@ name: neutron-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -38,7 +35,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67e1b40d7419 @@ -47,7 +43,6 @@ name: neutron-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -61,7 +56,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67e1b40d7419 diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 338f2b037..e4c4a495a 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -3,7 +3,6 @@ name: next-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67e7c516f385 @@ -23,7 +21,6 @@ name: next-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67e7c516f385 @@ -43,7 +39,6 @@ name: next-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67e7c516f385 diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index e6b160b06..5d0dd476f 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -3,7 +3,6 @@ name: nic-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67ef386204aa @@ -24,7 +22,6 @@ name: nic-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -36,7 +33,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67ef386204aa @@ -45,7 +41,6 @@ name: nic-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -58,7 +53,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' - archive-artifacts: '' # Used by the release job staging-profile-id: a67ef386204aa diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 239fdc64c..eb99c400c 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -3,7 +3,6 @@ name: ocpplugin-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a687673279f9c @@ -23,7 +21,6 @@ name: ocpplugin-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a687673279f9c @@ -43,7 +39,6 @@ name: ocpplugin-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a687673279f9c diff --git a/jjb/odl-openstack-cleanup-orphaned-nodes.sh b/jjb/odl-openstack-cleanup-orphaned-nodes.sh index 953dadc81..1b7f0c68e 100644 --- a/jjb/odl-openstack-cleanup-orphaned-nodes.sh +++ b/jjb/odl-openstack-cleanup-orphaned-nodes.sh @@ -10,9 +10,6 @@ ############################################################################## echo "---> Cleanup orphaned servers" -# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 -source "/tmp/v/openstack/bin/activate" - minion_in_jenkins() { # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...] # Returns: 0 If stack is in Jenkins and 1 if stack is not in Jenkins. @@ -46,13 +43,22 @@ minion_in_jenkins() { # Fetch server list before fetching active minions to minimize race condition # where we might be trying to delete servers while jobs are trying to start +# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 +source "/tmp/v/openstack/bin/activate" + # We purposely need word splitting here to create the OS_SERVERS array. # shellcheck disable=SC2207 -OS_SERVERS=($(openstack server list -f value -c "Name" | grep -E 'prd|snd')) +mapfile -t OS_SERVERS < <(openstack server list -f value -c "Name" | grep -E 'prd|snd') + +deactivate ############################# ## DELETE ORPHANED SERVERS ## ############################# + +# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 +source "/tmp/v/lftools/bin/activate" + # Search for servers that are not in use by either releng or sandbox silos and # delete them. for server in "${OS_SERVERS[@]}"; do @@ -64,6 +70,9 @@ for server in "${OS_SERVERS[@]}"; do continue else echo "Deleting $server" - openstack server delete "$server" + lftools openstack --os-cloud vex \ + server remove --minutes 15 "$server" fi done + +deactivate diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 46a237a5c..24da02383 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -123,7 +123,6 @@ name: odlparent-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs - gerrit-tox-verify diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index b119ff3b2..5892334b0 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -3,7 +3,6 @@ name: of-config-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6880455efe67 @@ -23,7 +21,6 @@ name: of-config-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6880455efe67 @@ -43,7 +39,6 @@ name: of-config-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6880455efe67 diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index ab4d336fe..0d55c6745 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -2,7 +2,6 @@ - project: name: circuitsw-oxygen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -13,7 +12,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68970cf5b25c @@ -21,7 +19,6 @@ - project: name: circuitsw-nitrogen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -32,7 +29,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68970cf5b25c @@ -40,7 +36,6 @@ - project: name: circuitsw-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -51,7 +46,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68970cf5b25c diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index 0659504ab..b3afb0481 100644 --- a/jjb/opendaylight-infra-stack.sh +++ b/jjb/opendaylight-infra-stack.sh @@ -48,6 +48,7 @@ for try in $(seq $STACK_RETRIES); do CREATE_FAILED) reason=$(openstack stack show "$STACK_NAME" -f value -c stack_status_reason) echo "ERROR: Failed to initialize infrastructure. Reason: $reason" + openstack stack resource list -n 25 "$STACK_NAME" echo "Deleting stack and possibly retrying to create..." openstack stack delete --yes "$STACK_NAME" diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 66561f090..5a921c0cb 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -3,7 +3,6 @@ name: openflowjava-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68a1507dae22 @@ -24,7 +22,6 @@ name: openflowjava-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -37,7 +34,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68a1507dae22 diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 26a9d73d8..5e1531903 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -3,7 +3,6 @@ name: openflowplugin-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -12,10 +11,10 @@ project-name: 'openflowplugin' branch: 'master' build-node: centos7-builder-2c-8g + build-timeout: 90 mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - build-timeout: 90 dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -31,7 +30,6 @@ name: openflowplugin-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -40,6 +38,7 @@ project-name: 'openflowplugin' branch: 'stable/nitrogen' build-node: centos7-builder-2c-8g + build-timeout: 90 mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -58,7 +57,6 @@ name: openflowplugin-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -67,6 +65,7 @@ project-name: 'openflowplugin' branch: 'stable/carbon' build-node: centos7-builder-2c-8g + build-timeout: 90 karaf-version: 'karaf3' mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' @@ -90,6 +89,7 @@ project-name: 'openflowplugin' branch: 'master' build-node: centos7-builder-2c-8g + build-timeout: 90 mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index 870839d26..66790de44 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -15,7 +15,6 @@ dependencies: '' email-upstream: '[ovil]' - archive-artifacts: '' # Used by the release job staging-profile-id: 7b48866c207d8 diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 108fe5c43..247ec8c2c 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -10,7 +10,9 @@ stream: - oxygen: branch: 'master' - os-branch: 'pike' + # os-branch: 'pike' + # issues with pike right now (esp l2gw), lets stick with ocata + os-branch: 'ocata' - nitrogen: branch: 'stable/nitrogen' os-branch: 'ocata' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index c9118a47d..652820f26 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -3,7 +3,6 @@ name: ovsdb-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -11,11 +10,11 @@ project: 'ovsdb' project-name: 'ovsdb' branch: 'master' + build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68b188166958 @@ -24,7 +23,6 @@ name: ovsdb-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -32,11 +30,11 @@ project: 'ovsdb' project-name: 'ovsdb' branch: 'stable/nitrogen' + build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68b188166958 @@ -45,7 +43,6 @@ name: ovsdb-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -53,12 +50,12 @@ project: 'ovsdb' project-name: 'ovsdb' branch: 'stable/carbon' + build-node: centos7-builder-2c-8g karaf-version: karaf3 mvn-settings: 'ovsdb-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68b188166958 diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 1fd08e53b..7ead8dd89 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -3,7 +3,6 @@ name: p4plugin-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[p4plugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68bf26e208d4 diff --git a/jjb/packaging/packaging-macros.yaml b/jjb/packaging/packaging-macros.yaml index 345cfa721..ea8df73b6 100644 --- a/jjb/packaging/packaging-macros.yaml +++ b/jjb/packaging/packaging-macros.yaml @@ -15,7 +15,8 @@ - shell: !include-raw: start-odl.sh - shell: !include-raw: test-ports-nofeature.sh - shell: !include-raw: test-karaf.expect - - shell: !include-raw: test-rest-ok.sh + # Disable this test until ODLPARENT-139 is fixed + # - shell: !include-raw: test-rest-ok.sh - shell: !include-raw: stop-odl.sh - shell: !include-raw: uninstall-rpm.sh - shell: | diff --git a/jjb/packaging/test-karaf.expect b/jjb/packaging/test-karaf.expect index 5368e208b..8b5fbcd67 100644 --- a/jjb/packaging/test-karaf.expect +++ b/jjb/packaging/test-karaf.expect @@ -42,26 +42,27 @@ expect {{ }} }} +# Disable this test until ODLPARENT-139 is fixed # Install feature -expect "$prompt" -send "feature:install odl-netvirt-openstack\r" -expect {{ - "Error executing command: Can't install feature" {{ - send_user "\nFailed to install test feature\n" - exit 1 - }} -}} +# expect "$prompt" +# send "feature:install odl-netvirt-openstack\r" +# expect {{ +# "Error executing command: Can't install feature" {{ +# send_user "\nFailed to install test feature\n" +# exit 1 +# }} +# }} # Verify installed feature is actually installed -expect "$prompt" +# expect "$prompt" # The -i flag will only show installed features -send "feature:list -i | grep odl-netvirt-openstack\r" -expect {{ - timeout {{ - send_user "\nTest feature not installed\n" - exit 1 - }} - "OpenDaylight :: NetVirt :: OpenStack" {{ - send_user "\nTest feature installed successfully\n" - }} -}} +# send "feature:list -i | grep odl-netvirt-openstack\r" +# expect {{ +# timeout {{ +# send_user "\nTest feature not installed\n" +# exit 1 +# }} +# "OpenDaylight :: NetVirt :: OpenStack" {{ +# send_user "\nTest feature installed successfully\n" +# }} +# }} diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 893de90b9..2fe013e80 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -3,7 +3,6 @@ name: packetcable-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68ca4a24655c @@ -23,7 +21,6 @@ name: packetcable-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68ca4a24655c @@ -43,7 +39,6 @@ name: packetcable-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68ca4a24655c diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 1b7254c9c..8d00a247d 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -2,7 +2,6 @@ - project: name: persistence-oxygen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68d3c2bb44d1 @@ -22,7 +20,6 @@ - project: name: persistence-nitrogen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68d3c2bb44d1 @@ -42,7 +38,6 @@ - project: name: persistence-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68d3c2bb44d1 diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index c299c63a5..839171392 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -77,7 +77,7 @@ docker_system_flavor: v2-standard-1 docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346 odl_system_count: 1 - odl_system_flavor: v2-standard-2 + odl_system_flavor: v2-highcpu-4 odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139 openstack_system_count: 1 openstack_system_flavor: v2-standard-4 diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 1b90cc55b..c1f41b551 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -5,6 +5,7 @@ - '{project-name}-ci-jobs': build-node: centos7-builder-2c-2g build-timeout: 60 + jenkins-silos: releng sandbox - builder-check-poms - builder-copy-sandbox-logs - builder-openstack-cron @@ -211,9 +212,7 @@ # Servers - odl-openstack-cleanup-stale-stacks - odl-openstack-cleanup-stale-nodes - # Disable orphaned nodes script. See: - # https://jira.linuxfoundation.org/browse/RELENG-780 - # - odl-openstack-cleanup-orphaned-nodes + - odl-openstack-cleanup-orphaned-nodes # Images - odl-openstack-check-image-protection - odl-openstack-cleanup-old-images diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index 48452b5c3..ed88f5101 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -28,6 +28,12 @@ # Default parameters # ###################### + archive-artifacts: > + **/*.log + **/hs_err_*.log + **/target/**/feature.xml + **/target/failsafe-reports/failsafe-summary.xml + **/target/surefire-reports/*-output.txt mvn-goals: clean install ##################### @@ -96,6 +102,12 @@ # Default parameters # ###################### + archive-artifacts: > + **/*.log + **/hs_err_*.log + **/target/**/feature.xml + **/target/failsafe-reports/failsafe-summary.xml + **/target/surefire-reports/*-output.txt mvn-version: mvn33 java-version: openjdk8 diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 47ae0223c..9af582ca7 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -2,7 +2,6 @@ - project: name: reservation-oxygen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -13,7 +12,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68d9bc504037 @@ -21,7 +19,6 @@ - project: name: reservation-nitrogen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -32,7 +29,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68d9bc504037 @@ -40,7 +36,6 @@ - project: name: reservation-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -52,7 +47,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68d9bc504037 diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index a970d3baf..99c856bf9 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -3,18 +3,17 @@ name: sdninterfaceapp-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'master' + build-node: centos7-builder-2c-8g mvn-settings: 'sdninterfaceapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68e3d1ff55e3 @@ -23,18 +22,17 @@ name: sdninterfaceapp-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'stable/nitrogen' + build-node: centos7-builder-2c-8g mvn-settings: 'sdninterfaceapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68e3d1ff55e3 @@ -43,19 +41,18 @@ name: sdninterfaceapp-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'stable/carbon' + build-node: centos7-builder-2c-8g karaf-version: karaf3 mvn-settings: 'sdninterfaceapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68e3d1ff55e3 @@ -67,5 +64,6 @@ project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'master' + build-node: centos7-builder-2c-8g mvn-settings: 'sdninterfaceapp-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index d1f34cc64..a38ec9b22 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -3,7 +3,6 @@ name: sfc-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -15,7 +14,6 @@ build-timeout: 120 dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - archive-artifacts: '' build-node: centos7-builder-8c-8g # Used by the release job @@ -25,7 +23,6 @@ name: sfc-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -36,7 +33,6 @@ mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - archive-artifacts: '' build-node: centos7-builder-8c-8g # Used by the release job @@ -46,7 +42,6 @@ name: sfc-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -58,7 +53,6 @@ mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - archive-artifacts: '' build-node: centos7-builder-8c-8g # Used by the release job diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index b580353fa..53a61ecd0 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -3,7 +3,6 @@ name: snbi-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68f328cefed6 @@ -23,7 +21,6 @@ name: snbi-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68f328cefed6 @@ -43,7 +39,6 @@ name: snbi-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68f328cefed6 diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 0797d5820..55ee92233 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -3,7 +3,6 @@ name: snmp-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68fb236b93a6 @@ -23,7 +21,6 @@ name: snmp-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68fb236b93a6 @@ -43,7 +39,6 @@ name: snmp-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a68fb236b93a6 diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 6bf8e0fec..ecb20af33 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -3,7 +3,6 @@ name: snmp4sdn-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69034a4b6ef5 @@ -23,7 +21,6 @@ name: snmp4sdn-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69034a4b6ef5 @@ -43,7 +39,6 @@ name: snmp4sdn-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69034a4b6ef5 diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index bbc06bd2e..351fb8881 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -3,7 +3,6 @@ name: sxp-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6909c75719b7 @@ -23,7 +21,6 @@ name: sxp-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6909c75719b7 @@ -43,7 +39,6 @@ name: sxp-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6909c75719b7 diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index e90c54398..e75892ea7 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -2,7 +2,6 @@ - project: name: systemmetrics-oxygen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'systemmetrics' @@ -13,7 +12,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69113575458e @@ -21,7 +19,6 @@ - project: name: systemmetrics-nitrogen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'systemmetrics' @@ -32,7 +29,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69113575458e @@ -40,7 +36,6 @@ - project: name: systemmetrics-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'systemmetrics' @@ -52,7 +47,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69113575458e diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 95a78bf24..c8147cf11 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -3,7 +3,6 @@ name: topoprocessing-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a691bbe2328cb @@ -23,7 +21,6 @@ name: topoprocessing-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a691bbe2328cb @@ -43,7 +39,6 @@ name: topoprocessing-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: a691bbe2328cb diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index c1602ba26..3f5c8fa12 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -2,7 +2,6 @@ - project: name: transportpce-oxygen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'transportpce' @@ -13,7 +12,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6927323fa3d4 @@ -21,7 +19,6 @@ - project: name: transportpce-nitrogen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'transportpce' @@ -32,7 +29,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6927323fa3d4 @@ -40,7 +36,6 @@ - project: name: transportpce-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs project: 'transportpce' @@ -52,7 +47,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' - archive-artifacts: '' # Used by the release job staging-profile-id: a6927323fa3d4 diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 8b26f5df0..830ddc77a 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -3,7 +3,6 @@ name: tsdr-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69373036303c @@ -23,7 +21,6 @@ name: tsdr-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69373036303c @@ -43,7 +39,6 @@ name: tsdr-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69373036303c diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 61b061724..b92ebd1c7 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -3,7 +3,6 @@ name: ttp-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a693f948563d5 @@ -23,7 +21,6 @@ name: ttp-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a693f948563d5 @@ -43,7 +39,6 @@ name: ttp-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a693f948563d5 diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 10e12ff2e..65e659cbc 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -3,7 +3,6 @@ name: unimgr-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' - archive-artifacts: '' build-node: centos7-builder-4c-16g # Used by the release job @@ -24,7 +22,6 @@ name: unimgr-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -35,7 +32,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' - archive-artifacts: '' build-node: centos7-builder-4c-16g # Used by the release job @@ -45,7 +41,6 @@ name: unimgr-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -57,7 +52,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' - archive-artifacts: '' build-node: centos7-builder-4c-16g # Used by the release job diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 16a9e10e2..fab6c6277 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -3,7 +3,6 @@ name: usc-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -15,7 +14,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a697b633b3ffe @@ -24,7 +22,6 @@ name: usc-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -36,7 +33,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a697b633b3ffe @@ -45,7 +41,6 @@ name: usc-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -58,7 +53,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' - archive-artifacts: '' # Used by the release job staging-profile-id: a697b633b3ffe diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 4d0ee2843..f4fd0fa48 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -3,7 +3,6 @@ name: usecplugin-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69902281e037 @@ -23,7 +21,6 @@ name: usecplugin-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69902281e037 @@ -43,7 +39,6 @@ name: usecplugin-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69902281e037 diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index e0c973e45..d5a7386eb 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -3,7 +3,6 @@ name: vtn-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -29,7 +28,6 @@ name: vtn-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -55,7 +53,6 @@ name: vtn-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index bc312bc65..c533c444c 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -3,7 +3,6 @@ name: yang-push-oxygen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -14,7 +13,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69aae2832869 @@ -23,7 +21,6 @@ name: yang-push-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -34,7 +31,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69aae2832869 @@ -43,7 +39,6 @@ name: yang-push-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -55,7 +50,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' - archive-artifacts: '' # Used by the release job staging-profile-id: a69aae2832869 diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 98e63de30..1358a5e88 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -2,7 +2,6 @@ - project: name: yangide-oxygen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: oxygen @@ -13,7 +12,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: fba306956f98 @@ -21,7 +19,6 @@ - project: name: yangide-nitrogen jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: nitrogen @@ -32,7 +29,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: fba306956f98 @@ -40,7 +36,6 @@ - project: name: yangide-carbon jobs: - - '{project-name}-integration-{stream}' - odl-maven-jobs stream: carbon @@ -52,7 +47,6 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' - archive-artifacts: '' # Used by the release job staging-profile-id: fba306956f98 diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index c2d51a1c7..19644cfc4 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -35,5 +35,4 @@ robot-options: '' # Additional patterns to archive - archive-artifacts: '' # FIXME: Delete if no patterns. diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 5dbfb07b9..2812b50aa 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -30,7 +30,6 @@ name: yangtools-nitrogen jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -59,7 +58,6 @@ name: yangtools-carbon jobs: - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs diff --git a/lf-ansible b/lf-ansible index 0b9b6addb..45fe40b67 160000 --- a/lf-ansible +++ b/lf-ansible @@ -1 +1 @@ -Subproject commit 0b9b6addb738ea7c483c8cdf75b9ae173480f9cd +Subproject commit 45fe40b674c0f2d2cfed080848ddeb2775b7d402 diff --git a/packer/common-packer b/packer/common-packer index ee1810e76..4332818a2 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit ee1810e763425480edd032f9dd2aae0c2b289b8c +Subproject commit 4332818a2ae9fc366bace64f459f4e44d1f8a86e diff --git a/packer/provision/builder.yaml b/packer/provision/local-builder.yaml similarity index 100% rename from packer/provision/builder.yaml rename to packer/provision/local-builder.yaml diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml new file mode 100644 index 000000000..919ba279a --- /dev/null +++ b/packer/provision/local-docker.yaml @@ -0,0 +1,14 @@ +--- +- import_playbook: ../common-packer/provision/docker.yaml + +- hosts: all + become_user: root + become_method: sudo + + pre_tasks: + - include_role: name=system-update + + post_tasks: + - name: System Reseal + script: ../common-packer/provision/system-reseal.sh + become: true diff --git a/packer/templates/builder.json b/packer/templates/builder.json deleted file mode 100644 index 54b5aa75c..000000000 --- a/packer/templates/builder.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "variables": { - "base_image": null, - "distro": null, - "cloud_auth_url": null, - "cloud_user": null, - "cloud_pass": null, - "cloud_network": null, - "cloud_tenant": null, - "cloud_user_data": null, - "ssh_user": null, - "ssh_proxy_host": "" - }, - "builders": [ - { - "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - builder - {{isotime \"20060102-1504\"}}", - "source_image_name": "{{user `base_image`}}", - "type": "openstack", - "identity_endpoint": "{{user `cloud_auth_url`}}", - "username": "{{user `cloud_user`}}", - "password": "{{user `cloud_pass`}}", - "tenant_name": "{{user `cloud_tenant`}}", - "domain_name": "Default", - "region": "ca-ymq-1", - "availability_zone": "ca-ymq-2", - "networks": [ - "{{user `cloud_network`}}" - ], - "user_data_file": "{{user `cloud_user_data`}}", - "ssh_username": "{{user `ssh_user`}}", - "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "flavor": "v1-standard-1", - "metadata": { - "ci_managed": "yes" - } - } - ], - "provisioners": [ - { - "type": "shell", - "scripts": [ - "common-packer/provision/install-python.sh" - ], - "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" - }, - { - "type": "ansible", - "playbook_file": "provision/builder.yaml", - "ansible_env_vars": [ - "ANSIBLE_NOCOWS=1", - "ANSIBLE_PIPELINING=True", - "ANSIBLE_ROLES_PATH=../lf-ansible/roles", - "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", - "ANSIBLE_STDOUT_CALLBACK=debug" - ] - } - ] -} diff --git a/packer/templates/builder.json b/packer/templates/builder.json new file mode 120000 index 000000000..bd227be50 --- /dev/null +++ b/packer/templates/builder.json @@ -0,0 +1 @@ +../common-packer/templates/builder.json \ No newline at end of file diff --git a/packer/templates/docker.json b/packer/templates/docker.json index 4f33327fb..edea6d285 120000 --- a/packer/templates/docker.json +++ b/packer/templates/docker.json @@ -1 +1 @@ -../common-packer/templates/docker.json.example \ No newline at end of file +../common-packer/templates/docker.json \ No newline at end of file