Merge "Migrate devstack images to Ansible provisioners"

diff --git a/docs/conf.yaml b/docs/conf.yaml
index 35bb427403be01eba8a55afe42c002b053453f8f..7498f18728e74cfaa55a0def75531e1c02a62728 100644 (file)
--- a/docs/conf.yaml
+++ b/docs/conf.yaml
@@ -1,2 +1,3 @@
+---
 project_cfg: opendaylight
 project: releng/builder

diff --git a/global-jjb b/global-jjb
index 343c22493055e0aa72968dc722c20a26bbbee725..d589c771dc75206bb2b6d592435c8316cffd29fb 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 343c22493055e0aa72968dc722c20a26bbbee725
+Subproject commit d589c771dc75206bb2b6d592435c8316cffd29fb

diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml
index eb1c931afe2033d88417cf948ca91c6c7e4301df..03dc74933fc15f3cb214c23ca4e526c6ca6c93e0 100644 (file)
--- a/jjb/alt-datastores/alt-datastores.yaml
+++ b/jjb/alt-datastores/alt-datastores.yaml
@@ -5,8 +5,8 @@
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-alt-datastores/82146/
-          rtd-token: ea1d83487d47ead46fa99256fad3213ec30c8c43
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/
+          rtd-token: dc412b0cc43fba4098173878f970e76380ce0084
       - odl-maven-jobs
 
     stream: sodium
@@ -28,8 +28,8 @@
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: alt-datastores
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-alt-datastores/82146/
-          rtd-token: ea1d83487d47ead46fa99256fad3213ec30c8c43
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/
+          rtd-token: dc412b0cc43fba4098173878f970e76380ce0084
       - odl-maven-jobs
 
     stream: neon

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index a219dd903592a4b2f292435cfa0ceec74ece0725..3844c7aeb67f5c3073a29f322250474977a28878 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -84,7 +84,6 @@
     # CSIT images configuration
     openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - 20190429-114045.588
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
-    openstack_pike_system_image: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
 
     # Default Robot framework options
     robot-options: ''

diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml
new file mode 100644 (file)
index 0000000..34dcef1
--- /dev/null
+++ b/jjb/detnet/detnet.yaml
@@ -0,0 +1,43 @@
+---
+- project:
+    name: detnet-sodium
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: detnet
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
+          rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce
+      - odl-maven-jobs
+
+    stream: sodium
+    project: 'detnet'
+    project-name: 'detnet'
+    branch: 'master'
+    mvn-settings: 'detnet-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[detnet] [odlparent] [yangtools] [controller]'
+    build-node: centos7-docker-2c-8g
+
+    # Used by the release job
+    staging-profile-id: 8981976d0fea7
+
+- project:
+    name: detnet-sonar
+    jobs:
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+
+    project: 'detnet'
+    project-name: 'detnet'
+    branch: 'master'
+    mvn-settings: 'detnet-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: detnet-view
+    views:
+      - project-view
+    project-name: detnet

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index 26e52ffb9c3e381cb647981b1f3f1d925c088752..9a4e1bd62e2be531f02c140b2181db5b959311e9 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -30,9 +30,9 @@
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
 
     public-bridge: 'br-int'
 

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 176ebc5d7d8fd158985e923c4c766857572b6b4e..e16edb39e3e6708dcd3b3df64f719a0a0384b35f 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -17,6 +17,8 @@
     mvn-settings: integration-distribution-settings
     mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    nexus-iq-namespace: odl-
+    nexus-iq-stage: release
     email-upstream: '[int/dist]'
     stream:
       - sodium:

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 8c27672cfc128c7b37de097050a5c903b9f11114..2204b211ba2e92c38afe98a84a49fe2dac026ba8 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -37,47 +37,47 @@
     odl_system_flavor: odl-standard-4
 
 - project:
-      name: netconf-csit-scale-max-devices
-      jobs:
-          - inttest-csit-1node
-
-      # The project name
-      project: 'netconf'
-
-      # The functionality under test
-      functionality: 'scale-max-devices'
-
-      # Project branches
-      stream:
-          - sodium:
-                branch: 'master'
-          - neon:
-                branch: 'stable/neon'
-          - fluorine:
-                branch: 'stable/fluorine'
-
-      install:
-          - only:
-                scope: 'only'
-
-      # Features to install
-      install-features: >
-          odl-restconf,
-          odl-clustering-test-app,
-          odl-netconf-mdsal,
-          odl-netconf-topology,
-          odl-jolokia,
-          decanter-collector-jmx,
-          decanter-appender-elasticsearch
-
-      # Robot custom options
-      robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-      # ODL system configuration
-      odl_system_flavor: odl-standard-8
-
-      # Plot Info
-      01-plot-title: 'Max Devices'
-      01-plot-yaxis: 'Devices'
-      01-plot-group: 'Netconf Devices'
-      01-plot-data-file: 'devices.csv'
+    name: netconf-csit-scale-max-devices
+    jobs:
+      - inttest-csit-1node
+
+    # The project name
+    project: 'netconf'
+
+    # The functionality under test
+    functionality: 'scale-max-devices'
+
+    # Project branches
+    stream:
+      - sodium:
+          branch: 'master'
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+
+    install:
+      - only:
+          scope: 'only'
+
+    # Features to install
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app,
+        odl-netconf-mdsal,
+        odl-netconf-topology,
+        odl-jolokia,
+        decanter-collector-jmx,
+        decanter-appender-elasticsearch
+
+    # Robot custom options
+    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+
+    # ODL system configuration
+    odl_system_flavor: odl-standard-8
+
+    # Plot Info
+    01-plot-title: 'Max Devices'
+    01-plot-yaxis: 'Devices'
+    01-plot-group: 'Netconf Devices'
+    01-plot-data-file: 'devices.csv'

diff --git a/jjb/opflex/scripts/libuv-build.sh b/jjb/opflex/scripts/libuv-build.sh
index eea1beff990d79a199944b538f18731ef8dcff66..e9b369d1e2e4353068e1b11d5ad77b30f9bb77dd 100644 (file)
--- a/jjb/opflex/scripts/libuv-build.sh
+++ b/jjb/opflex/scripts/libuv-build.sh
@@ -17,11 +17,11 @@ set -x
 ROOT=/tmp/opflex-prefix
 ./configure --prefix=$ROOT
 mkdir install-root
-DESTDIR=`pwd`/install-root make clean install
+DESTDIR=$(pwd)/install-root make clean install
 pushd install-root
-tar -cvzf "libuv-$LIBUV_VERSION.tar.gz" *
+tar -cvzf -- "libuv-$LIBUV_VERSION.tar.gz" *
 # Move tarball to dir of files that will be uploaded to Nexus
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
 mkdir -p "$UPLOAD_FILES_PATH"
-mv *.tar.gz "$_"
+mv -- *.tar.gz "$_"
 popd

diff --git a/jjb/opflex/scripts/openvswitch-build.sh b/jjb/opflex/scripts/openvswitch-build.sh
index 2d379c7515dbb045cbb0bef258384da338dbcaa6..b48ff5943409ae76220b4b3b28807d3d6341d2fd 100644 (file)
--- a/jjb/opflex/scripts/openvswitch-build.sh
+++ b/jjb/opflex/scripts/openvswitch-build.sh
@@ -23,7 +23,7 @@ mkdir -p "$DESTDIR"
 ./boot.sh
 ./configure --prefix="$ROOT" --enable-shared
 make -j4
-DESTDIR=`pwd`/$DESTDIR make install
+DESTDIR=$(pwd)/$DESTDIR make install
 
 if [[ $OPENVSWITCH_VERSION =~ 2.6.0 ]]; then
     mkdir -p $DESTDIR/$ROOT/include/openvswitch/openvswitch
@@ -36,9 +36,9 @@ elif [[ $OPENVSWITCH_VERSION =~ noiro ]]; then
 fi
 
 pushd $DESTDIR
-tar -cvzf "openvswitch-$OPENVSWITCH_VERSION.tar.gz" *
+tar -cvzf -- "openvswitch-$OPENVSWITCH_VERSION.tar.gz" *
 # Move tarball to dir of files that will be uploaded to Nexus
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
 mkdir -p "$UPLOAD_FILES_PATH"
-mv *.tar.gz "$_"
+mv -- *.tar.gz "$_"
 popd

diff --git a/jjb/opflex/scripts/opflex-build.sh b/jjb/opflex/scripts/opflex-build.sh
index ca5a8bf0be8cfc90fecf9e2477fb142f772bb271..859b1cbe5a5ea0fb4b4b46cc5745ce9b168788a1 100644 (file)
--- a/jjb/opflex/scripts/opflex-build.sh
+++ b/jjb/opflex/scripts/opflex-build.sh
@@ -27,13 +27,13 @@ mkdir -p "$ROOT"
 trap cleanup EXIT
 
 # Download the artifacts from nexus thirdparty
-wget -nv ${NEXUS_URL}/service/local/repositories/thirdparty/content/openvswitch/openvswitch/${OPENVSWITCH_VERSION}/openvswitch-${OPENVSWITCH_VERSION}.tar.gz
-wget -nv ${NEXUS_URL}/service/local/repositories/thirdparty/content/rapidjson/rapidjson/${RAPIDJSON_VERSION}/rapidjson-${RAPIDJSON_VERSION}.tar.gz
-wget -nv ${NEXUS_URL}/service/local/repositories/thirdparty/content/libuv/libuv/${LIBUV_VERSION}/libuv-${LIBUV_VERSION}.tar.gz
+wget -nv "${NEXUS_URL}/service/local/repositories/thirdparty/content/openvswitch/openvswitch/${OPENVSWITCH_VERSION}/openvswitch-${OPENVSWITCH_VERSION}.tar.gz"
+wget -nv "${NEXUS_URL}/service/local/repositories/thirdparty/content/rapidjson/rapidjson/${RAPIDJSON_VERSION}/rapidjson-${RAPIDJSON_VERSION}.tar.gz"
+wget -nv "${NEXUS_URL}/service/local/repositories/thirdparty/content/libuv/libuv/${LIBUV_VERSION}/libuv-${LIBUV_VERSION}.tar.gz"
 
-tar -xz -C "$ROOT" --strip-components=2 -f libuv-${LIBUV_VERSION}.tar.gz
-tar -xz -C "$ROOT" --strip-components=2 -f rapidjson-${RAPIDJSON_VERSION}.tar.gz
-tar -xz -C "$ROOT" --strip-components=2 -f openvswitch-${OPENVSWITCH_VERSION}.tar.gz
+tar -xz -C "$ROOT" --strip-components=2 -f "libuv-${LIBUV_VERSION}.tar.gz"
+tar -xz -C "$ROOT" --strip-components=2 -f "rapidjson-${RAPIDJSON_VERSION}.tar.gz"
+tar -xz -C "$ROOT" --strip-components=2 -f "openvswitch-${OPENVSWITCH_VERSION}.tar.gz"
 
 export PATH="$ROOT/bin:$PATH"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ROOT/lib"
@@ -47,14 +47,14 @@ mkdir -p "$UPLOAD_FILES_PATH"
 pushd libopflex
 ./autogen.sh
 ./configure --prefix="$ROOT" \
-    --with-buildversion=$BUILD_NUMBER \
+    --with-buildversion="$BUILD_NUMBER" \
     CPPFLAGS="-isystem $ROOT/include" \
     CXXFLAGS="-Wall"
 make -j4
 if ! make check; then find . -name test-suite.log -exec cat {} \; && false; fi
 make install
 make dist
-mv *.tar.gz "$UPLOAD_FILES_PATH"
+mv -- *.tar.gz "$UPLOAD_FILES_PATH"
 popd
 
 # build libmodelgbp
@@ -66,7 +66,7 @@ bash autogen.sh
 make -j2
 make install
 make dist
-mv *.tar.gz "$UPLOAD_FILES_PATH"
+mv -- *.tar.gz "$UPLOAD_FILES_PATH"
 popd
 popd
 
@@ -74,11 +74,11 @@ popd
 pushd agent-ovs
 ./autogen.sh
 ./configure --prefix="$ROOT" \
-    --with-buildversion=$BUILD_NUMBER \
+    --with-buildversion="$BUILD_NUMBER" \
     CPPFLAGS="-isystem $ROOT/include" \
     CXXFLAGS="-Wall"
 make -j4
 if ! make check; then find . -name test-suite.log -exec cat {} \; && false; fi
 make dist
-mv *.tar.gz "$UPLOAD_FILES_PATH"
+mv -- *.tar.gz "$UPLOAD_FILES_PATH"
 popd

diff --git a/jjb/opflex/scripts/rapidjson-build.sh b/jjb/opflex/scripts/rapidjson-build.sh
index 2ed65604e8b9bc11cad4fb7f9ab15efdf37f3573..f46597a75918067a1dd9ab4f799204f29d4f44ca 100644 (file)
--- a/jjb/opflex/scripts/rapidjson-build.sh
+++ b/jjb/opflex/scripts/rapidjson-build.sh
@@ -28,9 +28,9 @@ sed -e "s|@INCLUDE_INSTALL_DIR@|$ROOT/include|" \
     "$DESTDIR/$ROOT/lib/pkgconfig/RapidJSON.pc"
 
 pushd $DESTDIR
-tar -cvzf "rapidjson-$RAPIDJSON_VERSION.tar.gz" *
+tar -cvzf -- "rapidjson-$RAPIDJSON_VERSION.tar.gz" *
 # Move tarball to dir of files that will be uploaded to Nexus
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
 mkdir -p "$UPLOAD_FILES_PATH"
-mv *.tar.gz "$_"
+mv -- *.tar.gz "$_"
 popd

diff --git a/jjb/packaging/test-ports-nofeature.sh b/jjb/packaging/test-ports-nofeature.sh
index 84f4a6968d0110cbe2502b3b3b987fe00ee41868..ea14a4e340e8f1307dca8a313c4ceaf96631007e 100644 (file)
--- a/jjb/packaging/test-ports-nofeature.sh
+++ b/jjb/packaging/test-ports-nofeature.sh
@@ -22,7 +22,7 @@ while true; do
     closed_ports=()
     for port in "${expected_ports[@]}"
     do
-        if nmap -Pn -p$port localhost | grep -q open; then
+        if nmap -Pn -p"$port" localhost | grep -q open; then
             echo "Port $port is open"
             open_ports+=("$port")
         else
@@ -55,7 +55,7 @@ open_ports=()
 closed_ports=()
 for port in "${unexpected_ports[@]}"
 do
-    if nmap -Pn -p$port localhost | grep -q open; then
+    if nmap -Pn -p"$port" localhost | grep -q open; then
         echo "Port $port is open"
         open_ports+=("$port")
     else

diff --git a/jjb/packaging/test-rpm-docker.sh b/jjb/packaging/test-rpm-docker.sh
index c68ea3964ad933272e0da3baaaaf5df7a867d857..764377e5e25c656d27b2f7dec1bb98a6dc1fd5f7 100644 (file)
--- a/jjb/packaging/test-rpm-docker.sh
+++ b/jjb/packaging/test-rpm-docker.sh
@@ -11,41 +11,41 @@ scripts_path=/builder/jjb/packaging
 # A docker container must have been created by the build script
 if [ "$DISTRO" == "epel-7" ]; then
   docker_id=$(sudo docker ps -qf name=build_rpm_epel)
-  sudo docker exec $docker_id /usr/bin/yum -y install curl expect nmap openssh
+  sudo docker exec "$docker_id" /usr/bin/yum -y install curl expect nmap openssh
 elif [ "$DISTRO" == "opensuse-42" ]; then
   docker_id=$(sudo docker ps -qf name=build_rpm_suse)
-  sudo docker exec $docker_id /usr/bin/zypper -n install curl expect nmap openssh
+  sudo docker exec "$docker_id" /usr/bin/zypper -n install curl expect nmap openssh
 fi
 
-sudo docker exec $docker_id /bin/bash $scripts_path/test-rpm-deps.sh
+sudo docker exec "$docker_id" /bin/bash $scripts_path/test-rpm-deps.sh
 
-sudo docker exec $docker_id /bin/bash $scripts_path/install-rpm.sh
+sudo docker exec "$docker_id" /bin/bash $scripts_path/install-rpm.sh
 
-sudo docker exec $docker_id /bin/bash $scripts_path/start-odl.sh
+sudo docker exec "$docker_id" /bin/bash $scripts_path/start-odl.sh
 
-sudo docker exec $docker_id /bin/bash $scripts_path/test-ports-nofeature.sh
+sudo docker exec "$docker_id" /bin/bash $scripts_path/test-ports-nofeature.sh
 
 # Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it
 if [ "$STREAM" == "fluorine" ] || [ "$STREAM" == "neon" ] || [ "$STREAM" == "sodium" ]; then
-  sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect
+  sudo docker exec "$docker_id" /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect
 else
-  sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf.expect
-  sudo docker exec $docker_id /bin/bash $scripts_path/test-rest-ok.sh
+  sudo docker exec "$docker_id" /usr/bin/expect $scripts_path/test-karaf.expect
+  sudo docker exec "$docker_id" /bin/bash $scripts_path/test-rest-ok.sh
 fi
 
-sudo docker exec $docker_id /bin/bash $scripts_path/stop-odl.sh
+sudo docker exec "$docker_id" /bin/bash $scripts_path/stop-odl.sh
 
-sudo docker exec $docker_id /bin/bash $scripts_path/uninstall-rpm.sh
+sudo docker exec "$docker_id" /bin/bash $scripts_path/uninstall-rpm.sh
 
 if [ "$SILO" == "sandbox" ]; then
   echo "Not uploading RPMs to Nexus because running in sandbox"
 elif [ "$SILO" == "releng" ]; then
-  RPM_NAME=$(sudo docker exec $docker_id find /root/rpmbuild/RPMS/noarch/ -wholename '*.rpm')
-  SRPM_NAME=$(sudo docker exec $docker_id find /root/rpmbuild/SRPMS/ -wholename '*.rpm')
+  RPM_NAME=$(sudo docker exec "$docker_id" find /root/rpmbuild/RPMS/noarch/ -wholename '*.rpm')
+  SRPM_NAME=$(sudo docker exec "$docker_id" find /root/rpmbuild/SRPMS/ -wholename '*.rpm')
   UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
   mkdir -p "$UPLOAD_FILES_PATH"
-  sudo docker cp $docker_id:$RPM_NAME "$_"
-  sudo docker cp $docker_id:$SRPM_NAME "$_"
+  sudo docker cp "$docker_id:$RPM_NAME" "$_"
+  sudo docker cp "$docker_id:$SRPM_NAME" "$_"
 else
   echo "Unknown Jenkins silo: $SILO"
   exit 1

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index e78f608c9f181f16fca6e5d269884bac82e952ca..8ee10a8d71f7e7e44ba828688a16dbf09cdd3e0a 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -60,21 +60,21 @@
     templates: devstack-pre-pip-queens
 
 - project:
-        name: packer-devstack-pre-pip-rocky-jobs
-        jobs:
-            - gerrit-packer-merge
+    name: packer-devstack-pre-pip-rocky-jobs
+    jobs:
+      - gerrit-packer-merge
 
-        project: releng/builder
-        project-name: builder
-        branch: master
-        archive-artifacts: '**/*.log'
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
 
-        build-node: centos7-builder-2c-1g
-        build-timeout: 75
-        cron: '00 H 1 * *'
+    build-node: centos7-builder-2c-1g
+    build-timeout: 75
+    cron: '00 H 1 * *'
 
-        platforms: centos-7
-        templates: devstack-pre-pip-rocky
+    platforms: centos-7
+    templates: devstack-pre-pip-rocky
 
 - project:
     name: packer-docker-jobs

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index 914fec7d96d2da8a4be353f6def0d19a941f177f..fe6f0efb3ea8aa23732b99e3f23e77a0965acce7 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -14,13 +14,7 @@
     project: 'telemetry'
     project-name: 'telemetry'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'telemetry-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[telemetry]'
@@ -44,13 +38,7 @@
     project: 'telemetry'
     project-name: 'telemetry'
     branch: 'stable/neon'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'telemetry-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[telemetry]'
@@ -69,13 +57,7 @@
     project: 'telemetry'
     project-name: 'telemetry'
     branch: 'stable/fluorine'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'telemetry-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[telemetry]'

diff --git a/packer/provision/examples/apache-e-w.yaml b/packer/provision/examples/apache-e-w.yaml
index bb84fa1b9de83b30483908c33357f55dea1b8386..66e3ba5201375be36d71cdd3dde8fa6f6d7c8a2c 100644 (file)
--- a/packer/provision/examples/apache-e-w.yaml
+++ b/packer/provision/examples/apache-e-w.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/packer/provision/examples/apache-n-s.yaml b/packer/provision/examples/apache-n-s.yaml
index 7b774e4041e4cd94b8a1968693da383aed52b73f..e99b52c3419d11a15307cab4c6887583eddce5e7 100644 (file)
--- a/packer/provision/examples/apache-n-s.yaml
+++ b/packer/provision/examples/apache-n-s.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/packer/provision/examples/apache-pod.yaml b/packer/provision/examples/apache-pod.yaml
index cb97d1359a77d90e200c857d1d64b0b2bd9d1ad5..a4a01a86bdf3d05ab6597e4cf109a407de099eb0 100644 (file)
--- a/packer/provision/examples/apache-pod.yaml
+++ b/packer/provision/examples/apache-pod.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
@@ -6,5 +7,5 @@ metadata:
     name: webserver
 spec:
   containers:
-  - name: apachetwin
-    image: fedora/apache
+    - name: apachetwin
+      image: fedora/apache

diff --git a/packer/provision/examples/busybox.yaml b/packer/provision/examples/busybox.yaml
index babb7652f557b329aeab100b1210f8a232479c99..a0131574431cdafabc8bad3a240a52f4a7f21fa2 100644 (file)
--- a/packer/provision/examples/busybox.yaml
+++ b/packer/provision/examples/busybox.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
@@ -5,10 +6,10 @@ metadata:
   namespace: default
 spec:
   containers:
-  - image: busybox
-    command:
-      - sleep
-      - "3600"
-    imagePullPolicy: IfNotPresent
-    name: busybox
+    - image: busybox
+      command:
+        - sleep
+        - "3600"
+      imagePullPolicy: IfNotPresent
+      name: busybox
   restartPolicy: Always

diff --git a/packer/provision/examples/nginx-pod.yaml b/packer/provision/examples/nginx-pod.yaml
index d72959ee7da73cd4ece7f4a3d37ca43635a1d1e9..779775abcecd2ce5fc476ed2f660965435903d47 100644 (file)
--- a/packer/provision/examples/nginx-pod.yaml
+++ b/packer/provision/examples/nginx-pod.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
@@ -6,5 +7,5 @@ metadata:
     name: webserver
 spec:
   containers:
-  - name: nginxtwin
-    image: nginx
+    - name: nginxtwin
+      image: nginx

diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml
index be38c19c27bba4768de2da3eeec77c50a41ea217..dbd77846599b87864d2ea72b9fbbbca854253a34 100644 (file)
--- a/packer/provision/mininet-ovs-2.8.yaml
+++ b/packer/provision/mininet-ovs-2.8.yaml
@@ -119,7 +119,7 @@
             dest: /usr/local/bin/cbench
             mode: 0755
             owner: root
-            remote_src: yes
+            remote_src: true
           become: true
 
     - name: Install exabgp

diff --git a/packer/provision/robot.yaml b/packer/provision/robot.yaml
index 600fca12f09f8de9f78ef5b2d99cc87717d7f369..eb76e7b2acedadb618f7bd5b5fea74ab33220985 100644 (file)
--- a/packer/provision/robot.yaml
+++ b/packer/provision/robot.yaml
@@ -67,8 +67,8 @@
                 dest: /usr/local/bin/udpreplay
                 mode: 0755
                 owner: root
-                remote_src: yes
-              become: yes
+                remote_src: true
+              become: true
 
   post_tasks:
     - name: System Reseal

diff --git a/yamllint.conf b/yamllint.conf
index 32d76ab6ea39853b71b2bffaf3208dbabd1326b7..fe0c97dcbc8087df98101209dd43688af70570c9 100644 (file)
--- a/yamllint.conf
+++ b/yamllint.conf
@@ -1,3 +1,4 @@
+---
 extends: default
 
 rules:
@@ -5,4 +6,6 @@ rules:
     max-end: 1
   line-length:
     max: 120
+    ignore: |
+      packer