-Subproject commit 5dc3432cae2f13d9e5151a00a76a78ce73d92d70
+Subproject commit 5fc616e4b1231808c1f11608608415312b08aa02
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
HARDWARE_ID=odl-standard-1
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
HARDWARE_ID=odl-highcpu-2
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
HARDWARE_ID=odl-standard-2
--- /dev/null
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013
+HARDWARE_ID=odl-standard-1
- lf-update-java-alternatives:
java-version: "{java-version}"
- autorelease-checkout-gerrit-patch
- - autorelease-compare-projects
- lf-jacoco-nojava-workaround
- shell: "./scripts/list-project-dependencies.sh"
- autorelease-determine-merge-order
elasticsearch-attribute: 'disabled'
# CSIT images configuration
- openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200501-010133.750
+ openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
- openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200601-190140.080
+ openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
# Default Robot framework options
robot-options: ''
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
#####################
# Job configuration #
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
#####################
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
#####################
# Job Configuration #
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
#####################
# Job configuration #
controller-max-mem: '2048m'
docker_system_count: '1'
docker_system_flavor: 'odl-standard-1'
- docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752'
+ docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
#####################
# Job Configuration #
controller-max-mem: '2048m'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
- openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
openstack_system2_count: 0
openstack_system2_flavor: 'odl-standard-1'
- openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
tools_system_count: 1
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
#####################
# Job configuration #
controller-max-mem: '2048m'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
- openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
openstack_system2_count: 0
openstack_system2_flavor: 'odl-standard-1'
- openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
tools_system_count: 1
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
#####################
# Job configuration #
- gerrit-tox-verify:
branch: master
stream: master
+ build-node: centos7-builder-2c-2g
# CSIT Lists in defaults.yaml
stream:
project: releng/lftools
project-pattern: releng/lftools
build-node: centos7-builder-2c-2g
+ build-timeout: 30
rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-tools/32933/
rtd-token: 47a135ceba9053c6f88394a7171ebf5602a9fc95
stream: any
+++ /dev/null
----
-- project:
- name: lfn-process
- jobs:
- - '{project-name}-rtd-jobs'
- - gerrit-tox-verify
-
- project-name: lfn-process
- project: lfn/process
- project-pattern: lfn/process
- build-node: centos7-builder-2c-1g
- rtd-build-url: https://readthedocs.org/api/v2/webhook/lfn-process/33719/
- rtd-token: e505b4ae2bf222dcd2b6b08d7b04384ac0459b19
- stream: any
- branch: '*'
-
- git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
- gerrit-server-name: lf-releng
-
-- project:
- name: lfn-view
- views:
- - project-view
- project-name: lfn-process
scope: 'only'
# no mininet required
- tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
+ tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
# Features to install
install-features: 'odl-netconf-callhome-ssh,odl-restconf'
- all:
scope: 'all'
- tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
+ tools_system_image: ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
# Features to install
install-features: >
openstack_system_flavor: odl-highcpu-8
openstack_system2_flavor: odl-highcpu-4
tools_system_count: 2
- tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
os-cmb-cnt: 0
os-ctl-cnt: 1
os-cmp-cnt: 2
openstack_system_flavor: odl-highcpu-8
openstack_system2_flavor: odl-highcpu-4
tools_system_count: 2
- tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
os-cmb-cnt: 0
os-ctl-cnt: 1
os-cmp-cnt: 2
openstack_system_flavor: odl-highcpu-8
openstack_system2_flavor: odl-highcpu-4
tools_system_count: 2
- tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
+ tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
os-cmb-cnt: 0
os-ctl-cnt: 1
os-cmp-cnt: 2
+++ /dev/null
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2018 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# workaround for https://github.com/pypa/virtualenv/issues/1029
-export PS1=${PS1:-}
-
-# This script creates ArtifactPublishedEvent (APE)
-
-git clone https://gitlab.openci.io/openci/prototypes.git
-cd prototypes/federated-cicd
-virtualenv openci_publish
-cd openci_publish
-# shellcheck disable=SC1091
-source bin/activate
-python setup.py install
-
-# generate event body
-cat <<EOF > ./json_body.txt
-{
- "type": "$PUBLISH_EVENT_TYPE",
- "id": "$(uuidgen)",
- "time": "$(date -u +%Y-%m-%d_%H:%M:%SUTC)",
- "buildUrl": "$BUILD_URL",
- "branch": "master",
- "origin": "$PUBLISH_EVENT_ORIGIN",
- "artifactLocation": "$ARTIFACT_LOCATION",
- "confidenceLevel": "$CONFIDENCE_LEVEL"
-}
-EOF
-
-echo "Constructed $PUBLISH_EVENT_TYPE"
-echo "--------------------------------------------"
-cat ./json_body.txt
-echo "--------------------------------------------"
-
-python openci_publish -H 129.192.69.55 -U "${ACTIVEMQ_USER}" -p "${ACTIVEMQ_PASSWORD}" -n openci.prototype -B ./json_body.txt
-
-deactivate
+++ /dev/null
----
-- project:
- name: openci-odl
-
- project: '{name}'
-
- stream:
- - master:
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
-
- jobs:
- - 'openci-odl-autorelease-daily-{stream}'
- - 'openci-odl-promote-daily-{stream}'
-
-# This job gets triggered manually for the demo purposes.
-#
-# In prototype, either what this job does needs to be integrated to
-# ODL autorelease job or triggered by the upstream autorelease job.
-- job-template:
- name: 'openci-odl-autorelease-daily-{stream}'
-
- disabled: '{obj:disabled}'
-
- concurrent: false
-
- build-node: centos7-builder-2c-2g
-
- parameters:
- - string:
- name: PUBLISH_EVENT_TYPE
- default: ArtifactPublishedEvent
- description: 'The type of the event this job publishes'
- - string:
- name: PUBLISH_EVENT_ORIGIN
- default: ODL
- description: 'Originating community'
- - string:
- name: ARTIFACT_LOCATION
- default: https://url/to/artifact/on/odl/nexus/$BUILD_NUMBER
- description: 'The location of the artifact on ODL Nexus'
- - string:
- name: CONFIDENCE_LEVEL
- default: "'autorelease': 'SUCCESS'"
- description: 'The confidence level the published artifact gained'
-
- wrappers:
- - credentials-binding:
- - username-password-separated:
- credential-id: openci-connect-activemq
- username: ACTIVEMQ_USER
- password: ACTIVEMQ_PASSWORD
- - workspace-cleanup
-
- builders:
- # this build step in the job executes create-ape.sh to construct the
- # ArtifactPublishedEvent (ape) and publishes it using the python utility
- - shell:
- !include-raw-escape: ./create-ape.sh
-
-# This job gets triggered by a ConfidenceLevelModifiedEvent published
-# by OPNFV jobs so ODL can promote the autorelease artifact even further.
-#
-# This job is created for the demo purposes and might not be there for
-# the prototype.
-- job-template:
- name: 'openci-odl-promote-daily-{stream}'
-
- disabled: '{obj:disabled}'
-
- concurrent: false
-
- build-node: centos7-builder-2c-2g
-
- triggers:
- - jms-messaging:
- provider-name: openci.activemq
- selector: >
- JMSType = 'ConfidenceLevelModifiedEvent' and
- JMSOrigin = 'OPNFV' and
- JMSScenario = 'os-odl-nofeature-ha'
-
- builders:
- - shell: |
- #!/bin/bash
-
- echo
- echo "Triggered by $type"
- echo "----------------------------------"
- echo $CI_MESSAGE
- echo "----------------------------------"
- echo " Promoted ODL Autorelease artifact as release candidate!"
-
-- project:
- name: openci-odl-view
- views:
- - project-view
- project-name: openci-odl
# Job images
tools_system_count: 2
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: 'odl-openflowplugin-flow-services-rest'
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-bulk-o-matic'
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
install: 'all'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: 'odl-openflowplugin-flow-services-rest'
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
scope: 'only'
# Job images
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
# Features to install
install-features: >
- gerrit-tox-verify
# Automation for docs and jobs
- 'builder-update-image-list'
+ - gerrit-info-yaml-verify
# The following values are only specified here
# so that code blocks look similar to other projects.
rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
- gerrit-tox-verify:
build-timeout: 120
- build-node: centos7-builder-8c-8g
+ build-node: centos7-builder-4c-16g
- gerrit-release-merge
- odl-maven-jobs-jdk11
- odl-maven-verify-jobs
rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
- gerrit-tox-verify:
build-timeout: 120
- build-node: centos7-builder-8c-8g
+ build-node: centos7-builder-4c-16g
- odl-maven-jobs-jdk11
- odl-maven-verify-jobs
rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
- gerrit-tox-verify:
build-timeout: 120
- build-node: centos7-builder-8c-8g
+ build-node: centos7-builder-4c-16g
- odl-maven-jobs
- odl-maven-verify-jobs
apt: name=vlan state=present
become: true
+ - name: Install CSIT dependencies
+ apt:
+ name:
+ - git-review
+ - python-chardet
+ - python-ndg-httpsclient
+ - python-requests
+ - python-urllib3
+ state: present
+ become: true
+
post_tasks:
- name: System Reseal
script: ../common-packer/provision/system-reseal.sh
+++ /dev/null
-# Python
-__pycache__/
-*.pyc
-
-# ODL Signer
-.sign-artifacts
-gpg-signatures
deps = pre-commit
commands =
pre-commit install --hook-type commit-msg
- pre-commit run --all-files
+ pre-commit run --all-files --show-diff-on-failure
+ pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG
[testenv:prefix]
commands = python {toxinidir}/check_prefix.py