Merge "Remove unused test variable."

diff --git a/global-jjb b/global-jjb
index 3b2df8d227667ad2545a99979daae006c656372d..53f811d91411bf26a4acf00a9244c6ea0f4510d5 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 3b2df8d227667ad2545a99979daae006c656372d
+Subproject commit 53f811d91411bf26a4acf00a9244c6ea0f4510d5

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
index e1a1e717b05e6d939d757d1914d03d6b4d6f880c..928cc78b3a942f212c611b0908f089d8c8087f9b 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
@@ -1,4 +1,4 @@
 LABELS=centos7-robot-2c-8g
 IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20200813-045046.282
 HARDWARE_ID=odl-standard-2
-INSTANCE_CAP=20
+INSTANCE_CAP=16

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 177802ab467198bc5b5df93242b58a4346dcdfd0..866102ecab08b8135bd9551c47e51a2cf817cb92 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -13,7 +13,6 @@ INSTANCE_CAP=75
 SANDBOX_CAP=8
 FLOATING_IP_POOL=
 SECURITY_GROUPS=default
-AVAILABILITY_ZONE=ca-ymq-2
 STARTUP_TIMEOUT=600000
 KEY_PAIR_NAME=jenkins-ssh
 NUM_EXECUTORS=1

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index e632895d3071b7e5e1ba786bcbe0733a8909534b..4a8af4c063519006f1b9367d453a800731286b53 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -74,6 +74,17 @@
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
+- project:
+    name: aaa-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: aaa
+    project-name: aaa
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: aaa-settings
+
 - project:
     name: aaa-sonar
     jobs:

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index f16a93a0ea52f4deb90cbb5c73434de55386a045..d921d0d0a1b65ed418e8e1efdc96112a30d49e35 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -976,12 +976,14 @@ done
 
 # This workaround is required for Karaf decanter to work proper
 # The bundle:refresh command does not fail if the decanter bundles are not present
-echo "ssh to karaf console to do bundle refresh of decanter jmx collector"
-sshpass -p karaf ssh -o StrictHostKeyChecking=no \
-                     -o UserKnownHostsFile=/dev/null \
-                     -o LogLevel=error \
-                     -p 8101 karaf@localhost \
-                     "bundle:refresh org.apache.karaf.decanter.collector.jmx && bundle:refresh org.apache.karaf.decanter.api"
+# There seems to be impact in silicon stream so we better comment the lines below
+#
+#echo "ssh to karaf console to do bundle refresh of decanter jmx collector"
+#sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+#                     -o UserKnownHostsFile=/dev/null \
+#                     -o LogLevel=error \
+#                     -p 8101 karaf@localhost \
+#                     "bundle:refresh org.apache.karaf.decanter.collector.jmx && bundle:refresh org.apache.karaf.decanter.api"
 
 if [[ "$USEFEATURESBOOT" != "True" ]]; then
 

diff --git a/jjb/integration/integration-apex-run-tests.sh b/jjb/integration/integration-apex-run-tests.sh
index 6ce6d5c01c2b0a5ea87839910b0fc457ab0ad65f..58f4384246955325abf772d6913801fe4f0f8973 100644 (file)
--- a/jjb/integration/integration-apex-run-tests.sh
+++ b/jjb/integration/integration-apex-run-tests.sh
@@ -171,6 +171,7 @@ for suite in ${SUITES}; do
     -v SSH_KEY:robot_id_rsa \
     -v TOOLS_SYSTEM_IP: \
     -v USER_HOME:"${HOME}" \
+    -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \
     -v WORKSPACE:/tmp \
     "${TESTOPTIONS}" "${suite}" || true
 done

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 28439606c2bdaf6c96d54ddb45e09024f2ee6551..5053957a31ba8bdb88970031fdb9172f4afb3663 100755 (executable)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -89,6 +89,7 @@ robot -N "${TESTPLAN}" \
       -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" ${tools_variables} \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
+      -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \
       -v WORKSPACE:/tmp \
       ${TESTOPTIONS} ${SUITES} || true
 

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 1dbb1ed7b061e1941f4deab9599bfd0573548081..148c96a2078da2e87b4c971add0e31dd51ae569a 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -1233,6 +1233,7 @@ for suite in ${SUITES}; do
     -v TOOLS_SYSTEM_2_IP:"${TOOLS_SYSTEM_2_IP}" \
     -v TOOLS_SYSTEM_3_IP:"${TOOLS_SYSTEM_3_IP}" \
     -v USER_HOME:"${HOME}" \
+    -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \
     -v WORKSPACE:/tmp \
     ${TESTOPTIONS} ${suite} || true
 done

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index 2a961fdb146fcbbf22a3a65875f3c795c54ef5ab..c0ed0738f6b6b251d1c967728ccba67db872720a 100644 (file)
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -34,7 +34,7 @@ netifaces
 pyhocon
 requests
 robotframework-httplibrary
-robotframework-requests
+robotframework-requests==0.7.2
 robotframework-selenium2library
 robotframework-sshlibrary==3.1.1
 scapy

diff --git a/jjb/integration/integration-run-test.sh b/jjb/integration/integration-run-test.sh
index 35c54ecde2c56027902f8b613fdbc9b3dec936c9..f2762481076e45aae1eaa43e4e53a9eb02d26c87 100755 (executable)
--- a/jjb/integration/integration-run-test.sh
+++ b/jjb/integration/integration-run-test.sh
@@ -67,6 +67,7 @@ robot -N "${TESTPLAN}" \
       -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" ${tools_variables} \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
+      -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \
       -v WORKSPACE:/tmp \
       ${TESTOPTIONS} ${SUITES} || true
 

diff --git a/jjb/integration/integration-start-cluster-run-test.sh b/jjb/integration/integration-start-cluster-run-test.sh
index f9849976dcd4adae41b458fe36f28bd1ddf71e62..28a6900d996e9cf55f200ef51c7fbbafa38f88a5 100644 (file)
--- a/jjb/integration/integration-start-cluster-run-test.sh
+++ b/jjb/integration/integration-start-cluster-run-test.sh
@@ -67,6 +67,7 @@ robot -N "${TESTPLAN}" \
       -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" ${tools_variables} \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
+      -v IS_KARAF_APPL:"${IS_KARAF_APPL}" \
       -v WORKSPACE:/tmp \
       ${TESTOPTIONS} ${SUITES} || true
 

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d5ebb7002ce530374fd1cc2ac1ff0f3d73ce7c01..fad6965ba29dcb3224cf8237747436bf86c92d7b 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -64,9 +64,9 @@
       - silicon:
           branch: "master"
           csit-blocklist: >
-            bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo
-            netvirt odlmicro p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
-            yangtools gate longevity sanity tdd tempest wip
+            bier controller dluxapps lispflowmapping l2switch mdsal nemo
+            netvirt odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
+            gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only
             openflowplugin-csit-1node-bundle-based-reconciliation
@@ -77,8 +77,8 @@
       - aluminium:
           branch: "stable/aluminium"
           csit-blocklist: >
-            bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal nemo
-            odlmicro p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
+            bier controller dluxapps lispflowmapping l2switch mdsal nemo
+            odlmicro packetcable sfc sxp telemetry tsdr usc yangtools
             gate longevity sanity tdd tempest wip
             bgpcep-csit-3node-bgpclustering-all
             bgpcep-csit-3node-bgpclustering-ha-only

diff --git a/jjb/mdsal/mdsal-csit-netty-replication.yaml b/jjb/mdsal/mdsal-csit-netty-replication.yaml
new file mode 100644 (file)
index 0000000..2661856
--- /dev/null
+++ b/jjb/mdsal/mdsal-csit-netty-replication.yaml
@@ -0,0 +1,38 @@
+---
+- project:
+    name: mdsal-csit-netty-replicate
+    jobs:
+      - inttest-csit-3node
+
+    # The project name
+    project: "mdsal"
+
+    # The functionality under test
+    functionality: "netty-replicate"
+
+    # Project branches
+    stream:
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+
+    install:
+      - only:
+          scope: "only"
+
+    # Features to install
+    install-features: >
+      features-controller,
+      odl-mdsal-exp-replicate-netty,
+      odl-restconf-nb-bierman02,
+      odl-netconf-clustered-topology,
+      odl-clustering-test-app
+
+    # Robot custom options
+    robot-options: ""

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 35b16134787a5d9bbff6855ac7cbd9450b20107b..ea55b8f6f1ad735ce4aa225a564dd254bedcef4a 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -97,39 +97,6 @@
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
-- project:
-    name: mdsal-v4.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
-      - odl-maven-verify-jobs
-
-    project: mdsal
-    project-name: mdsal
-    branch: v4.0.x
-    stream: v4.0.x
-
-    mvn-settings: "mdsal-settings"
-    mvn-opts: "-Xmx2048m"
-    build-timeout: 90
-
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[mdsal] [odlparent] [yangtools]"
-    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-release-management
     jobs:

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index c50fe7821b6955090850dedb816bcf3b81e73c99..46efd0a09d277b009012aec4aac18239da08f700 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -52,13 +52,20 @@
 
     # Project branches
     stream:
-      - aluminium:
+      - silicon:
           branch: "master"
           jre: "openjdk11"
           robot-options:
             "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:400
             -v MAX_DEVICE_COUNT:3000 -v DEVICE_INCREMENT:200 -v TESTTOOL_BOOT_TIMEOUT:600s
             -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+          robot-options:
+            "-v USE_NETCONF_CONNECTOR:False -v SCHEMA_MODEL:juniper -v INIT_DEVICE_COUNT:1000
+            -v MAX_DEVICE_COUNT:4000 -v DEVICE_INCREMENT:500 -v TESTTOOL_BOOT_TIMEOUT:600s
+            -v MAX_HEAP:4G --flattenkeywords name:*repeat*keyword*"
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"

diff --git a/jjb/odlmicro/odlmicro-csit.yaml b/jjb/odlmicro/odlmicro-csit.yaml
index bae10ae596fcdb2ac0c0fbafb877b9fa3190fdbc..f6efcb9e2fa0cafb59c45051fdeeba57cad3e988 100644 (file)
--- a/jjb/odlmicro/odlmicro-csit.yaml
+++ b/jjb/odlmicro/odlmicro-csit.yaml
@@ -17,7 +17,6 @@
           branch: "master"
           jre: "openjdk11"
           functionality: "netconf"
-          trigger-jobs: "odlmicro-maven-merge-{stream}"
           robot-options: >
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
@@ -26,7 +25,6 @@
           branch: "stable/aluminium"
           jre: "openjdk11"
           functionality: "netconf"
-          trigger-jobs: "odlmicro-maven-merge-{stream}"
           robot-options: >
             -e ODLMICRO_IGN
             -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
@@ -37,3 +35,106 @@
           scope: "test"
 
     tools_system_count: 1
+
+- project:
+    name: odlmicro-csit-devices-scale
+    jobs:
+      - inttest-csit-1node
+
+    # The project name
+    project: "odlmicro"
+    controller-is-a-karaf-feature: "False"
+
+    # The functionality under test
+    testplan:
+      "{project}-{functionality}.txt"
+
+      # Project branches.
+    stream:
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+          functionality: "netconf-devices-scale"
+          robot-options: >
+            -e ODLMICRO_IGN
+            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
+            -v USE_NETCONF_CONNECTOR:False
+            -v SCHEMA_MODEL:juniper
+            -v INIT_DEVICE_COUNT:400
+            -v SCALE_TESTS:TRUE
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+          functionality: "netconf-devices-scale"
+          robot-options: >
+            -e ODLMICRO_IGN
+            -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.9.2-SNAPSHOT
+            -v USE_NETCONF_CONNECTOR:False
+            -v SCHEMA_MODEL:juniper
+            -v INIT_DEVICE_COUNT:5000
+            -v SCALE_TESTS:TRUE
+    install:
+      - manual:
+          scope: "test"
+
+    tools_system_count: 1
+    odl_system_flavor: odl-standard-8
+    tools_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"
+
+    build-timeout: "720"
+
+- project:
+    name: odlmicro-csit-general-scale
+    jobs:
+      - inttest-csit-1node
+
+    # The project name
+    project: "odlmicro"
+    controller-is-a-karaf-feature: "False"
+
+    # The functionality under test
+    testplan:
+      "{project}-{functionality}.txt"
+
+      # Project branches.
+    stream:
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+          functionality: "netconf-general-scale"
+          robot-options: >
+            -e ODLMICRO_IGN
+            -v ODL_MICRO_VERSION:1.0.1-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.10.0-SNAPSHOT
+            -v USE_NETCONF_CONNECTOR:False
+            -v SCHEMA_MODEL:juniper
+            -v INIT_DEVICE_COUNT:400
+            -v SCALE_TESTS:TRUE
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+          functionality: "netconf-general-scale"
+          robot-options: >
+            -e ODLMICRO_IGN
+            -v ODL_MICRO_VERSION:1.0.0-SNAPSHOT
+            -v NETCONF_TESTTOOL_VERSION:1.9.2-SNAPSHOT
+            -v USE_NETCONF_CONNECTOR:False
+            -v SCHEMA_MODEL:juniper
+            -v INIT_DEVICE_COUNT:5000
+            -v SCALE_TESTS:TRUE
+    install:
+      - manual:
+          scope: "test"
+
+    tools_system_count: 1
+    odl_system_flavor: odl-standard-8
+    tools_system_flavor: odl-standard-8
+
+    build-timeout: "720"

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 362650d1abe30d0e53da9e0b1bf144eb0f575c79..f37e3df928aa278f47d805dcd1938e2932050630 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -105,36 +105,6 @@
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
-- project:
-    name: odlparent-5.0.x
-    jobs:
-      - "{project-name}-maven-javadoc-jobs"
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 5.0.x
-    branch: 5.0.x
-
-    mvn-settings: odlparent-settings
-    mvn-opts: "-Xmx1024m"
-    mvn-version: mvn35
-
-    dependencies: ""
-    email-upstream: "[odlparent]"
-    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: 880d5ac25eaa
-
 - project:
     name: odlparent-release-management
     jobs:

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 9e4f716494c7b5275769fc1626079341c1a35dec..78246b440d4ba4b769d150533a2bca2cb731f63f 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -8,7 +8,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
-          build-timeout: 120
+          build-timeout: 140
           build-node: centos7-builder-4c-16g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
@@ -35,7 +35,7 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
-          build-timeout: 120
+          build-timeout: 140
           build-node: centos7-builder-4c-16g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 3e1e6e27c77f79604ac404de5e00b3af3c53e9d0..d33592d8db864ac553327f662209f7cf990836f2 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -110,33 +110,6 @@
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-v3.0.x
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: v3.0.x
-    stream: v3.0.x
-
-    mvn-settings: "yangtools-settings"
-    mvn-opts: "-Xmx1024m"
-
-    dependencies: ""
-    email-upstream: "[yangtools]"
-    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: 1271cf710cc09d
-
 - project:
     name: yangtools-release-management
     jobs:

diff --git a/packer/common-packer b/packer/common-packer
index e96974fa52edb7d8e7f27d314155bd088255e07d..38f810974c2fdb9b4eb998b5efee93362904cced 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit e96974fa52edb7d8e7f27d314155bd088255e07d
+Subproject commit 38f810974c2fdb9b4eb998b5efee93362904cced

diff --git a/packer/templates/builder.json b/packer/templates/builder.json
index fa19226a85adb5f9813cc9734ba4c22c69b2b211..d635dacbea500b6974da5d38f880a63fe485f0b0 100644 (file)
--- a/packer/templates/builder.json
+++ b/packer/templates/builder.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-builder-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json
index 602ced538985da593817b5702476ce84e84a46c1..89d2b6e4b4d29df92b4e8fd65cb8f61710887b56 100644 (file)
--- a/packer/templates/devstack-pre-pip-queens.json
+++ b/packer/templates/devstack-pre-pip-queens.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-queens-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index 348d28e3a6fa8b85d505e66a2ca6647a134e7931..c976afc234ec711557e5621659414e0a82372bcf 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - devstack-rocky - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-rocky-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json
index f2936434bbf4d6d265a97ccf1d92062926b349a8..bf6f91c2f24d7ef57778da4b86bbfc7020c260a2 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.json
+++ b/packer/templates/devstack-pre-pip-stein.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - devstack-stein - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-stein-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index e461a9a24ab15d33e65fbcf8a885eba81f14b80e..178dd022b5c4abc15fabd80a1a2ee01501574b12 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - devstack - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index 804a279e7c9e238f7522c36894c56d32d397dcb4..6b46057d1a553d34a1db81be3a0ea91c719e7ef3 100644 (file)
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-25-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json
index 0a9e5fdec9129f40890e331693b27aaa449e129c..493541bce843e80a8f38f80ccb82c014264c334a 100644 (file)
--- a/packer/templates/mininet-ovs-2.6.json
+++ b/packer/templates/mininet-ovs-2.6.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-26-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index 1b3a34f4b986bb8fcc29d447a3c0f6f4f42ca674..c8412343f8ef4b8c0fd40bb6e00e6c54bdd2f88e 100644 (file)
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-28-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index 7adc08c7f56cbc216499f764474f66c657aefe9e..ccdb6ff48e95eb077c18243fd1417cf501f8a3ea 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - robot - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-robot-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",

diff --git a/tox.ini b/tox.ini
index a432fb1bb558b8239e6a50b456b0498cd75b5d5b..0bce156ffe23efd391c7204678bb433359d9e4ea 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ commands = python {toxinidir}/check_jjb_version.py
 
 [testenv:pre-commit]
 basepython = python3
-deps = pre-commit
+deps = pre-commit==2.9.3
 commands =
     pre-commit install --hook-type commit-msg
     pre-commit run --all-files --show-diff-on-failure