Merge "Add stein devstack jobs"
authorThanh Ha (zxiiro) <zxiiro@gmail.com>
Wed, 18 Dec 2019 14:30:14 +0000 (14:30 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 18 Dec 2019 14:30:14 +0000 (14:30 +0000)
53 files changed:
jenkins-config/clouds/openstack/odlvex/centos7-apex-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/cloud.cfg
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/defaults.yaml
jjb/detnet/detnet.yaml
jjb/docs/docs-macros.yaml [new file with mode: 0644]
jjb/docs/docs-projects.yaml [new file with mode: 0644]
jjb/docs/docs-template.yaml [new file with mode: 0644]
jjb/docs/docs_version_bump.sh [new file with mode: 0644]
jjb/docs/docs_version_bump_projects.sh [new file with mode: 0644]
jjb/integration/common-functions.sh
jjb/integration/csit-jobs-magnesium.lst
jjb/integration/csit-jobs-neon.lst
jjb/integration/csit-jobs-sodium.lst
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/mdsal/mdsal.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/plastic/plastic.yaml
jjb/releng-packer-jobs.yaml
jjb/sfc/sfc.yaml
packer/provision/examples/apache-e-w.yaml [deleted file]
packer/provision/examples/apache-n-s.yaml [deleted file]
packer/provision/examples/apache-pod.yaml [deleted file]
packer/provision/examples/busybox.yaml [deleted file]
packer/provision/examples/nginx-pod.yaml [deleted file]
packer/provision/kubernetes.yaml [deleted file]
packer/provision/roles/coe/requirements.yaml [deleted file]
packer/provision/templates/odlovs-cni.conf.j2 [deleted file]

index 91bf577e99d257f454c264ee04b69727970e56a3..c12730a3e365a91a1249dff6ea752acdcabd5279 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 VOLUME_SIZE=100
 HARDWARE_ID=odl-highcpu-2
index d1e850b40ecf46ac1c027974dc3b37431511bab3..579358eafd4eba915ed6e98943d9b43c5df5446e 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 VOLUME_SIZE=150
 HARDWARE_ID=odl-standard-4
index b728075367988221c434b1b9b8ee2ee5d922d80b..10b142676ee06f2c0111cd3d14519418abbef060 100644 (file)
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 VOLUME_SIZE=150
 HARDWARE_ID=odl-highcpu-8
index cfeca9e3200eefe9081da657b9f1c93e8c7f7ecb..a320e03747494dfbc9ee71459377279519407366 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 HARDWARE_ID=v1-standard-1
index 852c006329f5a8743ec7a6b09123bcc7cd6015ee..16486e4d8a57b65b1e59102b8a8395f22e08e7f2 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 HARDWARE_ID=odl-highcpu-2
index 59305614ab1d728ea266b51c0fa833560bf162cc..a0ac9baf11258e2d80bc0be40dec38abc0bf1f61 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 HARDWARE_ID=odl-standard-2
index 56884e44d2ac31cdffe4e12ef0abb42540359c85..031470f4dd4810f51c3160fe0a1ae8817ac9b989 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 HARDWARE_ID=odl-standard-4
index 542a68ef5988c342e192689ff56d0596ebec1623..0d88ab7ca101ef523afdc9d532fbffa60e4ebb97 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 HARDWARE_ID=odl-highcpu-4
index 389dc2e85364d50162ab6f61fb71b90fecac0d38..f2ae5bf56103bccea9b5a50fb24c9e6a315381e9 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 HARDWARE_ID=odl-highcpu-8
index 925456dde277e914b28d418d1d224ae3bdc212d6..8d72a98723e66c6870d85e6c79d32060589e890d 100644 (file)
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829
 HARDWARE_ID=v1-standard-1
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229
 USER_DATA_ID=jenkins-init-script
index a476786637b8998a19b3be2e85dc2091d8b6c2af..8696e40962d8601bf4c8f3c42d98341c20c42a75 100644 (file)
@@ -11,7 +11,7 @@
     functionality: 'bgpclustering-longevity'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    elasticsearch-attribute: 'long'
+    #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
index 33d6a5ce11285153f6bc20fe7bd6538830c46dca..b321b2bb7ba68492fe4591ebed2a37de8a3c48d5 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: coe-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: coe
index 42381f72ccba667edde1ba5bbd297db09c2b3af6..770fc4619bcbf6464d2e3acc60577d0dd624bb21 100644 (file)
@@ -9,6 +9,8 @@
       - 'clustering-ask'
       - 'clustering-tell'
 
+    elasticsearch-attribute: 'disabled'
+
     stream:
       - magnesium:
           branch: 'master'
index 8bec36757ea2e9d8701fe8c199606e3a90c6f5a0..817c8cec91dfa33be809718f9e30b797246f7eaf 100644 (file)
@@ -11,7 +11,7 @@
     functionality: 'cs-chasing-leader-longevity'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    elasticsearch-attribute: 'long'
+    #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
index 5e86ed2136b93ae337cd0b13070b6581bc55d062..09e74efcc0ca9f1865a46a745cec36a84787b435 100644 (file)
@@ -11,7 +11,7 @@
     functionality: 'cs-partnheal-longevity'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    elasticsearch-attribute: 'long'
+    #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
index 789671ee334131557f0ce62aaf8e50f5b9452529..a8bc4c5652675b51bf9106eebc2686958ce0a003 100644 (file)
@@ -11,7 +11,7 @@
     functionality: 'ddb-expl-lead-movement-longevity'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    elasticsearch-attribute: 'long'
+    #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
index d929a664c4b194c5804170f0ff6f8858f8d6ab03..e26330c501eea6d652fdc6a89e7016bbd91a6ca0 100644 (file)
@@ -11,7 +11,7 @@
     functionality: 'notifications-longevity'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    elasticsearch-attribute: 'long'
+    #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
index 08f0269d5f9561905406ac0731a9d77e885e9619..239f268a35844875e6561ac3b5d647da998c3462 100644 (file)
@@ -11,7 +11,7 @@
     functionality: 'drb-partnheal-longevity'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    elasticsearch-attribute: 'long'
+    #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
index a82d48819a1851d695f3eb0a05a84df2f4e31b1b..c26699bd48a5d8b380c1573bdda2080d3efc1fb1 100644 (file)
@@ -11,7 +11,7 @@
     functionality: 'drb-precedence-longevity'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    elasticsearch-attribute: 'long'
+    #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
index 1958e64371f785c52b2bdbc33f4f551797523b7b..c2c92203723ac0d0b5af45c6c360922ed3a2848c 100644 (file)
@@ -83,7 +83,7 @@
     sm-features: ''
 
     # Elasticsearch attribute
-    elasticsearch-attribute: 'short'
+    elasticsearch-attribute: 'disabled'
 
     # CSIT images configuration
     openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20190628-065204.973
index d4723919bcc595b8aa16077a3fb8f982c3bbce86..1e68013b4f456bd42a5503fd598fcd67d379225c 100644 (file)
@@ -8,13 +8,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/
           rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce
       - gerrit-release-merge
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     stream: magnesium
     project: 'detnet'
     project-name: 'detnet'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'detnet-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
diff --git a/jjb/docs/docs-macros.yaml b/jjb/docs/docs-macros.yaml
new file mode 100644 (file)
index 0000000..0dd07a6
--- /dev/null
@@ -0,0 +1,8 @@
+---
+# Macros for the Docs project
+- builder:
+    name: docs-update
+    builders:
+      - shell: !include-raw:
+          - docs_version_bump.sh
+          - docs_version_bump_projects.sh
diff --git a/jjb/docs/docs-projects.yaml b/jjb/docs/docs-projects.yaml
new file mode 100644 (file)
index 0000000..260666f
--- /dev/null
@@ -0,0 +1,11 @@
+---
+- project:
+    name: docs-update-{stream}
+    jobs:
+      - 'docs-update-{stream}'
+    stream:
+      - master:
+          branch: 'master'
+      - sodium:
+          branch: 'stable/sodium'
+    build-node: centos7-builder-2c-2g
diff --git a/jjb/docs/docs-template.yaml b/jjb/docs/docs-template.yaml
new file mode 100644 (file)
index 0000000..5c8a35b
--- /dev/null
@@ -0,0 +1,89 @@
+---
+# Autorelease build jobs
+- job-template:
+    name: 'docs-update-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+    disable-job: 'false'
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: centos7-builder-2c-2g
+    disabled: '{disable-job}'
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - lf-infra-parameters:
+          project: 'releng/autorelease'
+          project-name: 'autorelease'
+          branch: '{branch}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+      - string:
+          name: RELEASE_NAME
+          description: 'The next release name eg Magnesium'
+      - bool:
+          name: PUBLISH
+          default: false
+          description: 'The flag to publish or not'
+
+    scm:
+      - lf-gerrit-clone:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          branch: '$GERRIT_BRANCH'
+          refspec: '$GERRIT_REFSPEC'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
+          submodule-recursive: true
+          submodule-timeout: 10
+          basedir: 'autorelease'
+          choosing-strategy: default
+          wipe-workspace: true
+      - lf-gerrit-clone:
+          git-url: '$GIT_URL/docs'
+          branch: '$GERRIT_BRANCH'
+          refspec: '$GERRIT_REFSPEC'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: true
+          basedir: 'docs'
+          submodule-recursive: false
+          submodule-timeout: 10
+          choosing-strategy: default
+          wipe-workspace: false
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+
+    builders:
+      - docs-update
+
+    publishers:
+      - lf-infra-publish
+
+- scm:
+    name: lf-gerrit-clone
+    scm:
+      - git:
+          credentials-id: "{jenkins-ssh-credential}"
+          url: "{git-url}"
+          basedir: "{basedir}"
+          refspec: "{refspec}"
+          branches:
+            - "refs/heads/{branch}"
+          skip-tag: true
+          wipe-workspace: "{wipe-workspace}"
+          submodule:
+            disable: "{submodule-disable}"
+            recursive: "{submodule-recursive}"
+            timeout: "{submodule-timeout}"
+          choosing-strategy: "{choosing-strategy}"
diff --git a/jjb/docs/docs_version_bump.sh b/jjb/docs/docs_version_bump.sh
new file mode 100644 (file)
index 0000000..bf18ee1
--- /dev/null
@@ -0,0 +1,106 @@
+#!/bin/bash -l
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+update_file_usage () {
+    echo "Usage: $0 <RELEASE_NAME> <PUBLISH>"
+    echo ""
+    echo "    RELEASE_NAME:  The RELEASE_NAME e.g Magnesium ."
+    echo "    PUBLISH:  Set to true to PUBLISH"
+    echo ""
+}
+while getopts :h: opts; do
+  case "$opts" in
+    h)
+        update_file_usage
+        exit 0
+        ;;
+    [?])
+        update_file_usage
+        exit 1
+        ;;
+  esac
+done
+set +u  # Allow unbound variables for virtualenv
+virtualenv --quiet "/tmp/v/git-review"
+# shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091
+source "/tmp/v/git-review/bin/activate"
+pip install --quiet --upgrade "pip==9.0.3" setuptools
+pip install --quiet --upgrade git-review
+git config --global --add gitreview.username "jenkins-$SILO"
+cd "$WORKSPACE"/docs || exit
+RELEASE_NAME=$RELEASE_NAME
+Next_release="$(tr '[:lower:]' '[:upper:]' <<< "${RELEASE_NAME:0:1}")${RELEASE_NAME:1}" # Captilize Version Name
+release_name=$STREAM
+Release_version="$(tr '[:lower:]' '[:upper:]' <<< "${release_name:0:1}")${release_name:1}" # Captilize Version Name
+PUBLISH=$PUBLISH
+stable_release_str=stable-$release_name
+echo "Start Version Updating in docs project"
+echo "RELEASE_NAME : $Next_release"
+if [ "$GERRIT_BRANCH" == "master" ]
+then
+    # ####################################
+    # # Changes in the master branch #
+    # ####################################
+    git checkout master
+    odl_release_str=odl-$release_name
+    next_odl_release_str=odl-$RELEASE_NAME
+    #change the odl-<release> linking to stable-<release> to odl-<next_release> linking to latest
+    sed -i "s/$odl_release_str/$next_odl_release_str/g;" docs/conf.py
+    sed -i "s/$stable_release_str/latest/g;" docs/conf.py
+
+    # Get the value of line with odl-<release> linking to stable-<release>
+    # for appending it to the line next to odl-<next_release> linking to latest
+    line_number_nr=$(sed -n "/$next_odl_release_str/=" docs/conf.py)
+    pattern=$line_number_nr"p"
+    odl_latest="sed -n $pattern docs/conf.py"
+    odl_latest_line_value=$($odl_latest)
+    append_odl_latest=$(echo "$odl_latest_line_value" | sed "s/latest/$stable_release_str/g; s/$RELEASE_NAME/$release_name/g" )
+    echo "Making changes in Master Branch"
+    # Update docs/conf.py
+    # sed -i "$line_number_nr'i'\
+    # $append_odl_latest" docs/conf.py
+    sed -i "$line_number_nr a $append_odl_latest" docs/conf.py
+    # Updating version in docs/conf.yaml
+    sed -i "s/$Release_version/$Next_release/g" docs/conf.yaml
+    # Updating version in docs/javadoc.rst
+    sed -i "s/$release_name/$RELEASE_NAME/g" docs/javadoc.rst
+    if [ "$PUBLISH" == "true" ]
+    then
+            git add docs/conf.py docs/conf.yaml docs/javadoc.rst
+            echo "Update configuratiom files in master branch"
+            git commit -s -m "Update configuratiom files in master branch
+
+            In docs/conf.py , add odl-$RELEASE_NAME pointing to latest
+            and change odl-$release_name to point to stable-$release_name.
+            In docs/conf.yaml
+            Change version from $Release_version to $Next_release.
+            In docs/javadoc.rst
+            Change links from $release_name to $RELEASE_NAME"
+            git review
+    fi
+else
+    ####################################
+    # Changes in the new stable branch #
+    ####################################
+    echo "Making changes in $GERRIT_BRANCH"
+
+    # #Updating links in docs/conf.py
+    sed -i "s/latest/$stable_release_str/g" docs/conf.py
+    if [ "$PUBLISH" == "true" ]
+    then
+            git add docs/conf.py
+            echo "Update docs/conf.py links from latest to $stable_release_str"
+            git commit -s -m "Update docs/conf.py links from latest to $stable_release_str
+
+            Should be $stable_release_str on ${GERRIT_BRANCH}."
+            git review
+    fi
+fi
\ No newline at end of file
diff --git a/jjb/docs/docs_version_bump_projects.sh b/jjb/docs/docs_version_bump_projects.sh
new file mode 100644 (file)
index 0000000..ce7cd3b
--- /dev/null
@@ -0,0 +1,66 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+update_file_usage () {
+    echo "Usage: $0 <release_name> <PUBLISH>"
+    echo ""
+    echo "    release_name:  The release_name e.g Magnesium ."
+    echo "    PUBLISH:  Set to true to PUBLISH"
+    echo ""
+}
+while getopts :h: opts; do
+  case "$opts" in
+    h)
+        update_file_usage
+        exit 0
+        ;;
+    [?])
+        update_file_usage
+        exit 1
+        ;;
+  esac
+done
+set +u  # Allow unbound variables for virtualenv
+virtualenv --quiet "/tmp/v/git-review"
+# shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091
+source "/tmp/v/git-review/bin/activate"
+pip install --quiet --upgrade "pip==9.0.3" setuptools
+pip install --quiet --upgrade git-review
+git config --global --add gitreview.username "jenkins-$SILO"
+cd "$WORKSPACE"/autorelease || exit
+GERRIT_PROJECT="releng/autorelease"
+if [ "$GERRIT_PROJECT" == "releng/autorelease" ]; then
+    # User input
+    RELEASE_NAME=$RELEASE_NAME
+    # Captilize Version Name
+    release_name="$(tr '[:lower:]' '[:upper:]' <<< "${RELEASE_NAME:0:1}")${RELEASE_NAME:1}"
+    echo "Start Version Updating in odl-projects"
+    echo "RELEASE_NAME : $release_name"
+    ################
+    # Start script #
+    ###############
+    git submodule update
+    #'|| true' for repo like serviceutils where docs/conf.yaml doesn't exist
+    command='sed -i ''"s/.*version.*/version: '"$release_name"'/"'' docs/conf.yaml || true'
+    git submodule foreach "git checkout $GERRIT_BRANCH"
+    echo "git checkout $GERRIT_BRANCH"
+    git submodule foreach "git branch"
+    git submodule foreach "$command"
+    if [ "$PUBLISH" == "true" ]
+      then
+        echo "Update docs header to $release_name in $STREAM"
+        git submodule foreach "git add . || true"
+        git submodule foreach "git commit -s -m 'Update docs header to $release_name in $STREAM
+
+    Should be $release_name on $STREAM.' || true"
+        git submodule foreach "git review || true"
+    fi
+fi
index 7365460eefa19fd4695fa35b4cc29227f34ed8b8..b68bdc0d7b3fa2075c6405aa7b0ab9d19b6f7a24 100644 (file)
@@ -911,7 +911,7 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
     FEATURE_TEST_STRING="features-test"
 fi
 
-sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.1.0/xml/features,%g" ${FEATURESCONF}
+sed -ie "s%\\(featuresRepositories=\\|featuresRepositories =\\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.2.0/xml/features,%g" ${FEATURESCONF}
 if [[ ! -z "${REPO_URL}" ]]; then
    sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
 fi
@@ -1009,7 +1009,7 @@ done;
 
 # if we ended up not finding ready status in the above loop, we can output some debugs
 grep 'org.opendaylight.infrautils.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-if [ $? -ne 0 ]; then
+if [ \$? -ne 0 ]; then
     echo "Timeout Controller DOWN"
     echo "Dumping first 500K bytes of karaf log..."
     head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
index 1bb62ec5ee0e3b13eda8fb21834b61003dfbe405..412bfb03cbc09318eb5ef50262cdc1521638edd2 100644 (file)
@@ -18,6 +18,7 @@ distribution-csit-1node-userfeatures-all-magnesium,
 distribution-csit-managed-magnesium,
 genius-csit-1node-upstream-only-magnesium,
 genius-csit-3node-upstream-only-magnesium,
+jsonrpc-csit-1node-basic-only-magnesium,
 lispflowmapping-csit-1node-msmr-all-magnesium,
 lispflowmapping-csit-1node-performance-only-magnesium,
 lispflowmapping-csit-3node-msmr-all-magnesium,
@@ -30,7 +31,6 @@ netconf-csit-3node-clustering-only-magnesium,
 netconf-csit-3node-clustering-scale-only-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-magnesium,
@@ -69,6 +69,4 @@ openflowplugin-csit-3node-clustering-only-magnesium,
 openflowplugin-csit-3node-clustering-perf-bulkomatic-only-magnesium,
 ovsdb-csit-1node-upstream-southbound-all-magnesium,
 ovsdb-csit-3node-upstream-clustering-only-magnesium,
-sfc-csit-3node-docker-full-deploy-all-magnesium,
-sfc-csit-3node-rest-basic-all-magnesium,
 yangtools-csit-1node-system-only-magnesium,
index 369e4da9458e4a99544a5da668fce22cae0b9db5..0810766602eb7eed2905d506b3164bce450d3534 100644 (file)
@@ -30,7 +30,6 @@ netconf-csit-1node-userfeatures-all-neon,
 netconf-csit-3node-clustering-only-neon,
 netconf-csit-3node-clustering-scale-only-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-neon,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-neon,
index 6be55703aaf969398e064c7f35e764652a9e9da6..c0c136b97e2dd1e62771ab34e59e51733e23dca0 100644 (file)
@@ -30,7 +30,6 @@ netconf-csit-3node-clustering-only-sodium,
 netconf-csit-3node-clustering-scale-only-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-dcgw-sodium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-snat-conntrack-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-sodium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-sodium,
index aa385c0570c02ab81161e670879c5be606bbe8dd..65387ddfd713a63d9b53634476d86215d27d3fb3 100644 (file)
 
     project: 'integration/distribution'
     project-name: 'distribution'
-    mvn-goals: 'clean deploy -f onap-karaf/pom.xml'
+    mvn-goals: 'clean deploy -f opendaylight/pom.xml'
     mvn-settings: 'integration-distribution-settings'
     mvn-opts: '-Xmx1024m'
     email-upstream: '[int/dist]'
index 0ca5106ce38907945139fd07a1da65f6ae27b58e..81afad6b154f82c15f8c9bf7606917fa1646b2e4 100644 (file)
@@ -105,7 +105,7 @@ function install_openstack_clients_in_robot_vm() {
 
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
         #networking-l2gw is not officially available in any release yet. Getting the latest stable version.
-        $PYTHON -m pip install networking-l2gw==11.0.0
+        $PYTHON -m pip install networking-l2gw==11.0.0 more-itertools==5.0.0
     fi
 }
 
index bfac98942786bca9329225d2009409d7ecc1184d..f0165cf611004a9262552fffda392c3c34ff14b8 100644 (file)
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
 
     #####################
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job Configuration #
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     docker_system_count: 1
     docker_system_flavor: 'odl-standard-1'
     docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
     openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     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-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
     openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
     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-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
index c91bf39afdc7fcf473f2b6e877e499c40b4da638..78ae351289a6f40f9a9a687f74ab5bd63f97b50e 100644 (file)
@@ -25,7 +25,7 @@
           csit-list: !include: csit-jobs-magnesium.lst
           build-order: >
               odlparent yangtools mdsal infrautils controller serviceutils aaa netconf
-              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+              daexim jsonrpc ovsdb neutron openflowplugin genius lispflowmapping netvirt
               bgpcep integration/distribution
 
       - sodium:
@@ -60,8 +60,8 @@
       - magnesium:
           branch: 'master'
           csit-blacklist: >
-              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
-              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
+              of-config p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
               gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
       - lispflowmapping-csit-1node-msmr-all-neon
       - netconf-csit-1node-callhome-only-neon
       - netconf-csit-1node-userfeatures-all-neon
-      - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon
       - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
       - openflowplugin-csit-1node-flow-services-all-neon
       - openflowplugin-csit-1node-longevity-only-neon
       - openflowplugin-csit-3node-clustering-bulkomatic-only-neon
       - openflowplugin-csit-3node-clustering-only-neon
       - ovsdb-csit-3node-upstream-clustering-only-neon
-      - sfc-csit-3node-docker-full-deploy-all-neon
-      - sfc-csit-3node-rest-basic-all-neon
     view-type: list
     filter-executors: false
     filter-queue: false
index 2626339c57b8bed76bf9d2303afd147211c8633f..43ec226ee04c29358bd40215d4bcc3f164365b26 100644 (file)
@@ -10,9 +10,6 @@
     # The functionality under test
     functionality: 'basic'
 
-    # Set trigger
-    trigger-jobs: '{project}-merge-{stream}'
-
     # Project branches
     stream:
       - magnesium:
index 5a339fb0627ffe7309b9b9b2071e1b4a4defef87..d9ac0887c9e1c2eaaf38922812c891152be53851 100644 (file)
@@ -2,6 +2,7 @@
 - project:
     name: jsonrpc-magnesium
     jobs:
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: jsonrpc
index 42c96da4eca5b3d3195911c3d172d30e2c0cbfff..cf2e9b68d16a5a7b824ddc7f92333c607dbb700d 100644 (file)
     branch: master
     stream: master
 
+    java-version: 'openjdk11'
+    mvn-settings: 'mdsal-settings'
+
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    staging-profile-id: a674173c7b29d
+
+- project:
+    name: mdsal-5.0.x
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: mdsal
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
+          rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: mdsal
+    project-name: mdsal
+    branch: 5.0.x
+    stream: 5.0.x
+
     java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
index a4f26094d611ae15aa1b5313f148441e565240a3..813abc6b5efe31ec3dc3186580a210aefe2abac9 100644 (file)
           openstack_system_image: '{openstack_stein_system_image}'
           openstack_system2_image: '{openstack_stein_system_image}'
 
-- project:
-    name: netvirt-csit-sfc-openstack-integration
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-4
-    openstack_system2_flavor: odl-highcpu-8
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-sfc'
-
-    functionality:
-      - sfc:
-          enable-openstack-services: 'placement-api,tempest'
-          enable-openstack-compute-services: 'placement-client'
-          enable-openstack-plugins: 'networking-odl,networking-sfc'
-          testplan: '{project}-extensions-sfc.txt'
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-
-    stream:
-      - magnesium:
-          branch: 'master'
-          ovs-install: 'v2.9.2'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
-          ovs-install: 'v2.9.2'
-      - neon:
-          branch: 'stable/neon'
-          ovs-install: 'v2.9.2'
-
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     jobs:
     stream:
       - magnesium:
           branch: 'master'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:
index 03c1962adc7370193f10f7e405f09c5f63117c22..375e2c5654118f5824aef4e4149733ab8b77946f 100644 (file)
@@ -33,9 +33,8 @@
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
@@ -72,9 +71,8 @@
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
         neutron-merge-{stream},
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
-        ovsdb-merge-{stream},
-        sfc-merge-{stream}
-    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+        ovsdb-merge-{stream}
+    email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb]'
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
index b717e4e6e73aceac565b031583dd58482c6b5a0f..c3b4c4df0eb7779edeb9eab72f095b7d543efc7b 100644 (file)
@@ -32,8 +32,7 @@
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        odl-infrautils-metrics
+        odl-openflowplugin-app-table-miss-enforcer
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'
index 805082cab2423aa6a9a8962d3470282e9357c030..81258823d25130bdf4616bd67464733a2fa5dfb8 100644 (file)
@@ -12,7 +12,7 @@
     functionality: 'longevity'
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
-    elasticsearch-attribute: 'long'
+    #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
index fbcc00bb268a6f73fd16a1cdccfc08c67300230c..9831cece446eebf52a42a590451a825421395f6f 100644 (file)
@@ -86,9 +86,6 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
     stream: neon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
index 77586be2cab52090a3b56b792dabd04f595126bf..b45e42826d39ed3b678e4c0972fe6e4c26c4ee07 100644 (file)
@@ -7,6 +7,7 @@
           project-pattern: plastic
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-plastic/102307/
           rtd-token: 963a1745b909ae6a1eae01f814c4983d17fdd44c
+      - gerrit-tox-verify
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
index 390b8c91f019828a60caab3409771cfe6ccf714f..a4684c2b3578315b508afd9a9a6a77f28976dc3b 100644 (file)
     templates: robot
     update-cloud-image: true
 
-- project:
-    name: packer-kubernetes-jobs
-    jobs:
-      - gerrit-packer-merge
-
-    project: releng/builder
-    project-name: builder
-    branch: master
-    archive-artifacts: '**/*.log'
-
-    build-node: centos7-builder-2c-1g
-    build-timeout: 90
-    cron: '00 H 1 * *'
-
-    platforms:
-      - ubuntu-16.04
-      - ubuntu-18.04:
-          disable-job: true
-    templates: kubernetes
-    update-cloud-image: true
-
 - project:
     name: openstack-update-cloud-images
     jobs:
index 7d539580df00ec66eb3747be242f0994dde73f59..44356d4341f18cfc56710060938298dde08308eb 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: sfc-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: sfc
diff --git a/packer/provision/examples/apache-e-w.yaml b/packer/provision/examples/apache-e-w.yaml
deleted file mode 100644 (file)
index 66e3ba5..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    name: apacheservice
-    role: service
-  name: apacheservice
-spec:
-  ports:
-    - port: 8800
-      targetPort: 80
-      protocol: TCP
-      name: tcp
-  selector:
-    name: webserver
diff --git a/packer/provision/examples/apache-n-s.yaml b/packer/provision/examples/apache-n-s.yaml
deleted file mode 100644 (file)
index e99b52c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    name: apacheexternal
-    role: service
-  name: apacheexternal
-spec:
-  ports:
-    - port: 8800
-      targetPort: 80
-      protocol: TCP
-      name: tcp
-  selector:
-    name: webserver
-  type: NodePort
diff --git a/packer/provision/examples/apache-pod.yaml b/packer/provision/examples/apache-pod.yaml
deleted file mode 100644 (file)
index a4a01a8..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: apachetwin
-  labels:
-    name: webserver
-spec:
-  containers:
-    - name: apachetwin
-      image: fedora/apache
diff --git a/packer/provision/examples/busybox.yaml b/packer/provision/examples/busybox.yaml
deleted file mode 100644 (file)
index a013157..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: busybox
-  namespace: default
-spec:
-  containers:
-    - 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
deleted file mode 100644 (file)
index 779775a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: nginxtwin
-  labels:
-    name: webserver
-spec:
-  containers:
-    - name: nginxtwin
-      image: nginx
diff --git a/packer/provision/kubernetes.yaml b/packer/provision/kubernetes.yaml
deleted file mode 100644 (file)
index 77df480..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- import_playbook: ../common-packer/provision/baseline.yaml
-
-- hosts: all
-  vars:
-    openvswitch_version: 2.8.2
-    openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d
-    k8s_version: 1.13.2
-    golang_version: 1.11.5
-    golang_checksum: sha256:ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25
-
-  pre_tasks:
-    - include_role: name=lfit.system-update
-
-  roles:
-    - {role: lfit.docker-install, ubuntu_docker_version: 18.06.0~ce~3-0~ubuntu}
-    - fkautz.bridge-utils-install
-    - fkautz.golang-install
-    - fkautz.kubernetes-install
-    - fkautz.openvswitch-install
-
-- hosts: all
-  tasks:
-    - name: Make example directory
-      file:
-        path: /opt/k8s-examples
-        state: directory
-      become: true
-    - name: Copy example files to example directory
-      synchronize:
-        src: ../provision/examples/
-        dest: /opt/k8s-examples/
-      become: true
-
-  post_tasks:
-    - name: System Reseal
-      script: ../common-packer/provision/system-reseal.sh
-      become: true
diff --git a/packer/provision/roles/coe/requirements.yaml b/packer/provision/roles/coe/requirements.yaml
deleted file mode 100644 (file)
index c4e1b21..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- src: fkautz.bridge-utils-install
-- src: fkautz.openvswitch-install
-- src: fkautz.kubernetes-install
-- src: fkautz.golang-install
diff --git a/packer/provision/templates/odlovs-cni.conf.j2 b/packer/provision/templates/odlovs-cni.conf.j2
deleted file mode 100644 (file)
index 3782908..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "cniVersion": "0.3.0",
-    "name": "odl-cni",
-    "type": "odlovs-cni",
-    "mgrPort": {{ manager_port }},
-    "mgrActive": true,
-    "manager": "{{ manager_ip }}",
-    "ovsBridge": "br-int",
-    "ctlrPort": {{ controller_port }},
-    "ctlrActive": true,
-    "controller": "{{ controller_ip }}",
-    "externalIntf": "{{ external_interface }}",
-    "externalIp": "{{ external_ip }}",
-    "ipam": {
-        "type": "host-local",
-        "subnet": "{{ subnet }}",
-        "routes": [{
-            "dst": "0.0.0.0/0"
-        }],
-        "gateway": "{{ gateway }}"
-    }
-}