Merge "Remove all refs to nitrogen from int/dist"
authorJamo Luhrsen <jluhrsen@redhat.com>
Fri, 18 May 2018 00:24:56 +0000 (00:24 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 18 May 2018 00:24:56 +0000 (00:24 +0000)
jjb/integration/csit-jobs-nitrogen.lst [deleted file]
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-test-jobs.yaml

diff --git a/jjb/integration/csit-jobs-nitrogen.lst b/jjb/integration/csit-jobs-nitrogen.lst
deleted file mode 100644 (file)
index 97cb4dd..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-aaa-csit-1node-authn-all-nitrogen,
-aaa-csit-1node-keystone-all-nitrogen,
-aaa-csit-1node-tls-only-nitrogen,
-alto-csit-1node-setup-all-nitrogen,
-bgpcep-csit-1node-bgp-ingest-all-nitrogen,
-bgpcep-csit-1node-bgp-ingest-mixed-all-nitrogen,
-bgpcep-csit-1node-throughpcep-all-nitrogen,
-bgpcep-csit-1node-userfeatures-all-nitrogen,
-bgpcep-csit-3node-bgpclustering-all-nitrogen,
-bgpcep-csit-3node-bgpclustering-ha-only-nitrogen,
-bier-csit-1node-basic-all-nitrogen,
-controller-csit-1node-akka1-all-nitrogen,
-controller-csit-1node-benchmark-all-nitrogen,
-controller-csit-1node-rest-cars-perf-all-nitrogen,
-controller-csit-3node-benchmark-all-nitrogen,
-controller-csit-3node-clustering-all-nitrogen,
-controller-csit-3node-rest-clust-cars-perf-only-nitrogen,
-daexim-csit-1node-basic-only-nitrogen,
-daexim-csit-3node-clustering-basic-only-nitrogen,
-distribution-csit-1node-userfeatures-all-nitrogen,
-dluxapps-csit-1node-yangman-all-nitrogen,
-genius-csit-1node-upstream-all-nitrogen,
-genius-csit-3node-upstream-all-nitrogen,
-groupbasedpolicy-csit-1node-3-node-all-nitrogen,
-groupbasedpolicy-csit-1node-6node-all-nitrogen,
-groupbasedpolicy-csit-1node-openstack-ocata-openstack-nitrogen,
-groupbasedpolicy-csit-1node-sxp-only-nitrogen,
-groupbasedpolicy-csit-3node-clustering-all-nitrogen,
-l2switch-csit-1node-host-scalability-daily-only-nitrogen,
-l2switch-csit-1node-scalability-all-nitrogen,
-l2switch-csit-1node-switch-all-nitrogen,
-lispflowmapping-csit-1node-msmr-all-nitrogen,
-lispflowmapping-csit-1node-performance-only-nitrogen,
-lispflowmapping-csit-3node-msmr-all-nitrogen,
-mdsal-csit-1node-bindingv1-only-nitrogen,
-messaging4transport-csit-1node-basic-all-nitrogen,
-nemo-csit-1node-engine-all-nitrogen,
-netconf-csit-1node-callhome-only-nitrogen,
-netconf-csit-1node-scale-all-nitrogen,
-netconf-csit-1node-userfeatures-all-nitrogen,
-netconf-csit-3node-cluster-stress-all-nitrogen,
-netconf-csit-3node-clustering-all-nitrogen,
-netconf-csit-3node-clustering-scale-all-nitrogen,
-netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-1node-openstack-queens-sfc-nitrogen,
-netvirt-csit-1node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-3node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-3node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen,
-netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-nitrogen,
-netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-nitrogen,
-nic-csit-1node-basic-all-nitrogen,
-ocpplugin-csit-1node-get-all-nitrogen,
-ocpplugin-csit-1node-scalability-all-nitrogen,
-of-config-csit-1node-basic-all-nitrogen,
-openflowplugin-csit-1node-cbench-only-nitrogen,
-openflowplugin-csit-1node-flow-services-all-nitrogen,
-openflowplugin-csit-1node-perf-bulkomatic-only-nitrogen,
-openflowplugin-csit-1node-perf-stats-collection-only-nitrogen,
-openflowplugin-csit-1node-scale-link-only-nitrogen,
-openflowplugin-csit-1node-scale-only-nitrogen,
-openflowplugin-csit-1node-scale-switch-only-nitrogen,
-openflowplugin-csit-3node-clustering-bulkomatic-only-nitrogen,
-openflowplugin-csit-3node-clustering-only-nitrogen,
-openflowplugin-csit-3node-clustering-perf-bulkomatic-only-nitrogen,
-ovsdb-csit-1node-upstream-southbound-all-nitrogen,
-ovsdb-csit-3node-upstream-clustering-only-nitrogen,
-packetcable-csit-1node-pcmm-all-nitrogen,
-sdninterfaceapp-csit-1node-basic-only-nitrogen,
-sfc-csit-3node-docker-full-deploy-all-nitrogen,
-sfc-csit-3node-rest-basic-all-nitrogen,
-sxp-csit-1node-basic-all-nitrogen,
-sxp-csit-1node-filtering-all-nitrogen,
-sxp-csit-1node-performance-all-nitrogen,
-sxp-csit-1node-topology-all-nitrogen,
-sxp-csit-3node-clustering-all-nitrogen,
-sxp-csit-3node-routing-all-nitrogen,
-topoprocessing-csit-1node-topology-operations-all-nitrogen,
-unimgr-csit-1node-basic-all-nitrogen,
-unimgr-csit-1node-legato-all-nitrogen,
-usc-csit-1node-channel-all-nitrogen,
-usc-csit-1node-tcp-all-nitrogen,
-usecplugin-csit-1node-basic-all-nitrogen,
-yangtools-csit-1node-system-only-nitrogen,
index ece342a28a590b228a267f0f3649adc61dcca2fe..7547109446da8185e9d404c8004a05d6d322e546 100644 (file)
@@ -84,38 +84,19 @@ function dump_log_and_exit {
 }
 
 echo "Waiting up to 5 minutes for controller to come up, checking every 5 seconds..."
-if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ]; then
-    # Only oxygen and above have the infrautils.ready feature, so using REST API to determine if the controller is ready.
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
-        echo ${RESP}
-        if [[ ${RESP} == *"200"* ]]; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-else
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-fi
+COUNT="0"
+while true; do
+    COUNT=$(( ${COUNT} + 5 ))
+    sleep 5
+    echo "already waited ${COUNT} seconds..."
+    if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
+        echo "Controller is UP"
+        break
+    elif (( "${COUNT}" > "300" )); then
+        echo "Timeout Controller DOWN"
+        dump_log_and_exit
+    fi
+done
 
 # echo "Checking OSGi bundles..."
 # sshpass seems to fail with new karaf version
index 87665874a6846d4747d64b2390cc2753fee38efc..4c69b386c989004a5b4e73d64fb7bc868c077141 100644 (file)
@@ -16,8 +16,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     install:
       - all:
index b9eaf1a2de892eabbe317693feebd32812e0471a..5caeead33c15e8c9f20a8d7b5b6c4a7ffc045ca0 100644 (file)
@@ -35,9 +35,6 @@
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          karaf-version: karaf4
 
 - project:
     name: distribution-sonar
index d213584c9296deaf0032ca24877955276700b2e6..b79fab7f86208499bf6e4f80c16b22e5cb9fd284 100644 (file)
@@ -155,70 +155,29 @@ if [[ "$USEFEATURESBOOT" != "True" ]]; then
                          feature:list -i
 fi
 
-if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ];
-then
-    echo "only oxygen and above have the infrautils.ready feature, so using REST API to /modules or /shards to determine if the controller is ready.";
-
-    COUNT="0"
-
-    while true; do
-        RESP="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null )"
-        echo \$RESP
-
-        if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
-            SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=\member-\$1-shard-inventory-config,type=DistributedConfigDatastore)"
-            echo \$SHARD
-        fi
-
-        if ([[ \$RESP == *"200"* ]] && ([[ "${ENABLE_HAPROXY_FOR_NEUTRON}" != "yes" ]] || [[ \$SHARD  == *'"status":200'* ]])); then
-            echo "Controller is UP"
-            break
-
-        elif (( "\$COUNT" > "600" )); then
-            echo Timeout Controller DOWN
-            echo "Dumping first 500K bytes of karaf log..."
-            head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-            echo "Dumping last 500K bytes of karaf log..."
-            tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-            echo "Listing all open ports on controller system"
-            netstat -pnatu
-            exit 1
-        else
-
-        COUNT=\$(( \${COUNT} + 1 ))
-        sleep 1
-
-        if [[ \$((\$COUNT % 5)) == 0 ]]; then
-            echo already waited \${COUNT} seconds...
-        fi
-    fi
-    done
-
-else
-    echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..."
-    for i in {1..36};
-        do sleep 5;
-        grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-        if [ \$? -eq 0 ]
-        then
-          echo "Controller is UP"
-          break
-        fi
-    done;
-
-    # if we ended up not finding ready status in the above loop, we can output some debugs
+echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..."
+for i in {1..36};
+    do sleep 5;
     grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
-    if [ $? -ne 0 ]
+    if [ \$? -eq 0 ]
     then
-        echo "Timeout Controller DOWN"
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Listing all open ports on controller system"
-        netstat -pnatu
-        exit 1
+      echo "Controller is UP"
+      break
     fi
+done;
+
+# if we ended up not finding ready status in the above loop, we can output some debugs
+grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+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"
+    echo "Dumping last 500K bytes of karaf log..."
+    tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+    echo "Listing all open ports on controller system"
+    netstat -pnatu
+    exit 1
 fi
 
 echo "Listing all open ports on controller system..."
index 15aa436b89e18cb219867d2aa591b1caadf391c9..26f9cf6cc087c93aa0bb94ba1d7ef83f7cce5e2d 100644 (file)
               infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
               lispflowmapping openflowplugin coe genius sfc netvirt
 
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-nitrogen.lst
-          build-order: >
-              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
-              lispflowmapping openflowplugin coe genius sfc netvirt
-
 - project:
     name: integration-distribution
     project: integration/test
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
 
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          csit-blacklist: capwap centinel coe didm iotdm jsonrpc lacp netide tsdr gate longevity sanity tdd wip
-          csit-list: !include: csit-jobs-nitrogen.lst
-          csit-weekly-list: '{csit-weekly-list-nitrogen}'
-          csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
-
 - project:
     name: integration-sanity
     project: integration/test
           branch: 'stable/oxygen'
           karaf-version: karaf4
           csit-sanity-list: '{csit-sanity-list-oxygen}'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          karaf-version: karaf4
-          csit-sanity-list: '{csit-sanity-list-nitrogen}'
 
 - job-template:
     name: 'integration-distribution-test-{stream}'