Merge "Remove netvirt apex jobs"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 70c665d2f122efd6bbe64e58a2f411d87c8081d3..81492b45049f4fe3243bf50f348911b1e7d86e57 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -17,26 +17,31 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - builder - x86_64 - 20200626-165329.838
 * ZZCI - CentOS 7 - builder - x86_64 - 20200729-063722.113
 * ZZCI - CentOS 7 - builder - x86_64 - 20200730-200731.474
+* ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500
 * ZZCI - CentOS 7 - devstack - 20171208-1648
 * ZZCI - CentOS 7 - devstack - 20180723-235345.727
 * ZZCI - CentOS 7 - devstack - 20180911-204116.460
 * ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200601-230324.154
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896
+* ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836
 * ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
 * ZZCI - CentOS 7 - devstack-pike - 20171208-1649
 * ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
 * ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
 * ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200601-190140.080
 * ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200801-190141.781
+* ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200811-124350.479
 * ZZCI - CentOS 7 - devstack-rocky - 20190601-000116.015
 * ZZCI - CentOS 7 - devstack-rocky - 20190628-065204.973
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200801-000156.903
+* ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200811-042113.395
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200101-010206.159
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200112-040429.851
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200501-010133.750
 * ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200801-010144.168
+* ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200811-070703.256
 * ZZCI - CentOS 7 - docker - 20171209-0317
 * ZZCI - CentOS 7 - docker - 20180109-0346
 * ZZCI - CentOS 7 - docker - 20180110-1659
@@ -46,12 +51,15 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840
 * ZZCI - CentOS 7 - docker - x86_64 - 20200601-220134.752
 * ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401
+* ZZCI - CentOS 7 - docker - x86_64 - 20200810-015757.604
 * ZZCI - CentOS 7 - java-builder - 20171206-1842
 * ZZCI - CentOS 7 - java-builder - 20171209-0032
 * ZZCI - CentOS 7 - robot - 20180601-2050
 * ZZCI - CentOS 7 - robot - 20190430-080312.962
 * ZZCI - CentOS 7 - robot - x86_64 - 20191002-145719.577
+* ZZCI - CentOS 7 - robot - x86_64 - 20200812-002103.678
 * ZZCI - CentOS 8 - builder - x86_64 - 20200801-040136.580
+* ZZCI - CentOS 8 - builder - x86_64 - 20200811-042012.627
 * ZZCI - OPNFV - apex - compute - 0
 * ZZCI - OPNFV - apex - compute - 1
 * ZZCI - OPNFV - apex - controller - 0
@@ -59,6 +67,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 14.04 - gbp - 20180723-235516.505
 * ZZCI - Ubuntu 16.04 - docker - 20180601-2047
 * ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190614-042302.610
+* ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200301-170125.878
 * ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200401-170202.250
 * ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200701-170158.227
 * ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
@@ -70,13 +79,18 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - Ubuntu 16.04 - kubernetes - 20190211-225526.126
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240
 * ZZCI - Ubuntu 16.04 - mininet-ovs-25 - x86_64 - 20200501-040138.328
+* ZZCI - Ubuntu 16.04 - mininet-ovs-25 - x86_64 - 20200811-124230.205
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
 * ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200801-180146.111
+* ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200811-124233.615
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200601-220226.013
 * ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229
+* ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630
 * ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200313-183318.557
+* ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200801-040248.718
 * ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200121-232651.765
 * ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200521-041758.169
+* ZZCI - Ubuntu 18.04 - mininet-ovs-25 - x86_64 - 20200811-124252.042

diff --git a/global-jjb b/global-jjb
index 762400ee2c77d0cb936ca1757bc2ac1515042436..0c66e6ab1d80770ca7060237b436190f9fa274a0 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 762400ee2c77d0cb936ca1757bc2ac1515042436
+Subproject commit 0c66e6ab1d80770ca7060237b436190f9fa274a0

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
deleted file mode 100644 (file)
index 4ce7f8e..0000000
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180601-2047
-HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg
new file mode 100644 (file)
index 0000000..b097fa2
--- /dev/null
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1804-docker-4c-4g.cfg
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200801-040248.718
+HARDWARE_ID=odl-highcpu-4

diff --git a/jjb/autorelease/update-autorelease-projects-views.sh b/jjb/autorelease/update-autorelease-projects-views.sh
index abfde5b9c66fa29e3f48571d3fe9bf091efbe96c..15947cc26e18a292e85521c11eb6a48fbf270dec 100755 (executable)
--- a/jjb/autorelease/update-autorelease-projects-views.sh
+++ b/jjb/autorelease/update-autorelease-projects-views.sh
@@ -49,13 +49,13 @@ cat > "$VIEWS_AR_YAML_FILE" << EOF
 
 - view:
     name: Merge-${STREAM^}
-    description: 'List of ${STREAM^} Merge jobs for Autorelease'
+    description: "List of ${STREAM^} Merge jobs for Autorelease"
     job-name:
 EOF
 
 for module in "${modules[@]}"; do
     echo "Include project:$module to autorelease view"
-    echo "      - '$module-maven-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE"
+    echo "      - \"$module-maven-merge-${STREAM}\"" >> "$VIEWS_AR_YAML_FILE"
 done
 echo "    <<: *releng_autorelease_view_common_${STREAM}" >> "$VIEWS_AR_YAML_FILE"
 

diff --git a/jjb/autorelease/update-validate-autorelease-projects.sh b/jjb/autorelease/update-validate-autorelease-projects.sh
index a6663752f38ef21ee239d4ca7ab7f146e7e84a14..6dadbcc31f981ae2f14069099df42a1082b816ca 100644 (file)
--- a/jjb/autorelease/update-validate-autorelease-projects.sh
+++ b/jjb/autorelease/update-validate-autorelease-projects.sh
@@ -31,7 +31,7 @@ cat > "$YAML_FILE" << EOF
 - project:
     name: autorelease-validate-${STREAM}
     jobs:
-      - '{project-name}-validate-autorelease-{stream}'
+      - "{project-name}-validate-autorelease-{stream}"
     stream: ${STREAM}
     branch: ${BRANCH}
     project-name:

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 16eae9bd5126144695d60bd6841f5f5e805d03cc..c635e7b56127ba60762140e2ff4d6961461af624 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -88,7 +88,7 @@
 
     # CSIT images configuration
     openstack_stein_system_image: ZZCI - CentOS 7 - devstack-stein - x86_64 - 20200811-070703.256
-    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200811-042113.395
+    openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20200813-042753.841
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200811-124350.479
 
     # Default Robot framework options

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
deleted file mode 100644 (file)
index 264a3a0..0000000
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: groupbasedpolicy-csit-openstack-integration
-    jobs:
-      - inttest-csit-openstack-custom
-
-    # The project name
-    project: "groupbasedpolicy"
-    disable-job: true
-
-    topology:
-      - 1node:
-          openstack_system_count: 1
-          odl_system_count: 1
-          enable-haproxy: "no"
-
-    testplan: "{project}-{topology}-openstack.txt"
-
-    # The project name
-    functionality: "openstack"
-
-    stream:
-      - silicon:
-          branch: "master"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
-
-    openstack:
-      - queens:
-          openstack-branch: "stable/queens"
-          odl-ml2-branch: "stable/queens"
-
-    public-bridge: "br-int"
-
-    enable-openstack-plugins: "networking-odl"
-
-    security-group-mode: "none"

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
deleted file mode 100644 (file)
index bf6305a..0000000
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: groupbasedpolicy-csit-3node
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: "groupbasedpolicy"
-    disable-job: true
-
-    # The functionality under test
-    functionality: "3-node"
-
-    # Project branches
-    stream:
-      - silicon:
-          branch: "master"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
-
-    install:
-      - all:
-          scope: "all"
-
-    # 3 Ubuntu VMs in JCloud configuration
-    tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431
-
-    # Features to install
-    install-features: "odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all"
-
-    # Robot custom options
-    robot-options: ""

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
deleted file mode 100644 (file)
index 2da966c..0000000
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-- project:
-    name: groupbasedpolicy-csit-6node
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: "groupbasedpolicy"
-    disable-job: true
-
-    # The functionality under test
-    functionality: "6node"
-
-    # Project branches
-    stream:
-      - silicon:
-          branch: "master"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
-
-    install:
-      - all:
-          scope: "all"
-
-    # 6 Ubuntu VMs in JCloud configuration
-    tools_system_count: 6
-    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431
-
-    # Features to install
-    install-features: >
-      odl-groupbasedpolicy-ofoverlay,
-      odl-groupbasedpolicy-ui,
-      odl-restconf-all
-
-    # Robot custom options
-    robot-options: ""

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
deleted file mode 100644 (file)
index 76f0716..0000000
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- project:
-    name: groupbasedpolicy-csit-clustering
-    jobs:
-      - inttest-csit-3node
-
-    # The project name
-    project: "groupbasedpolicy"
-    disable-job: true
-
-    # The functionality under test
-    functionality: "clustering"
-
-    # Project branches
-    stream:
-      - silicon:
-          branch: "master"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
-
-    install:
-      - all:
-          scope: "all"
-
-    # Features to install
-    install-features: >
-      odl-groupbasedpolicy-ofoverlay,
-      odl-groupbasedpolicy-ui,
-      odl-restconf-all
-
-    # Robot custom options
-    robot-options: ""

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
deleted file mode 100644 (file)
index 2ac02f6..0000000
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: groupbasedpolicy-csit-sxp
-    jobs:
-      - inttest-csit-1node
-    # The project name
-    project: "groupbasedpolicy"
-    disable-job: true
-
-    # The functionality under test
-    functionality: "sxp"
-
-    # Project branches
-    stream:
-      - silicon:
-          branch: "master"
-          jre: "openjdk11"
-      - aluminium:
-          branch: "stable/aluminium"
-          jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
-      - sodium:
-          branch: "stable/sodium"
-
-    install:
-      - only:
-          scope: "only"
-
-    # Mininet configuration (TOOLS)
-    tools_system_count: 2
-
-    # Features to install
-    install-features: >
-      odl-restconf,
-      odl-groupbasedpolicy-sxp-ise-adapter,
-      odl-groupbasedpolicy-ne-location-provider,
-      odl-groupbasedpolicy-ios-xe,
-      odl-sfc-ios-xe-renderer,
-      odl-sxp-controller
-
-    # Robot custom options
-    robot-options: ""

diff --git a/jjb/integration/csit-jobs-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst
index 840795b5e83fee0d8dd2751984e550280bb6d5c1..c79ab024b5d8231b17be8c8281c7543d6d88dbb9 100644 (file)
--- a/jjb/integration/csit-jobs-aluminium.lst
+++ b/jjb/integration/csit-jobs-aluminium.lst
@@ -32,10 +32,6 @@ netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-alumini
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-dcgw-aluminium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-aluminium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
-netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-aluminium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-aluminium,
@@ -44,9 +40,7 @@ netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-aluminium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-aluminium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-aluminium,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
 netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-aluminium,
 netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-aluminium,
 odltools-csit-1node-upstream-all-aluminium,
 openflowplugin-csit-1node-cbench-only-aluminium,

diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst
index b54dab6a1afb5b5cca9eb9e31c59ddbf78c0204d..b120a70b0928ef66cf10fc68c1335aab407b3bb4 100644 (file)
--- a/jjb/integration/csit-jobs-magnesium.lst
+++ b/jjb/integration/csit-jobs-magnesium.lst
@@ -28,12 +28,6 @@ netconf-csit-1node-userfeatures-rfc8040-all-magnesium,
 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-rocky-dcgw-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upgrade-snat-conntrack-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
-netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-magnesium,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-magnesium,
@@ -46,17 +40,11 @@ netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-rocky-upstream-stateful-snat-conntra
 netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium,
 netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-magnesium,
 netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-magnesium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-magnesium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
-netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
 netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-magnesium,
-netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
 netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
-netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-magnesium,
 netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-magnesium,
 odltools-csit-1node-upstream-all-magnesium,
 openflowplugin-csit-1node-cbench-only-magnesium,

diff --git a/jjb/integration/csit-jobs-silicon.lst b/jjb/integration/csit-jobs-silicon.lst
index e244fb7cb1f774bca62a958db74afb5dabcfadb3..55a7cdfa926f707d8c78ab5d527fd0cb9e4a0c10 100644 (file)
--- a/jjb/integration/csit-jobs-silicon.lst
+++ b/jjb/integration/csit-jobs-silicon.lst
@@ -19,6 +19,32 @@ netconf-csit-1node-userfeatures-rfc8040-all-silicon,
 netconf-csit-3node-clustering-only-silicon,
 netconf-csit-3node-clustering-scale-only-silicon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-dcgw-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upgrade-snat-conntrack-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon,
+netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-dcgw-silicon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-silicon,
+netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-dcgw-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-dcgw-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-itm-direct-tunnels-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon,
+netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-snat-conntrack-silicon,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon,
+netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-rocky-upstream-stateful-silicon,
+netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-stein-upstream-stateful-silicon,
 odltools-csit-1node-upstream-all-silicon,
 openflowplugin-csit-1node-cbench-only-silicon,
 openflowplugin-csit-1node-flow-services-all-silicon,

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index dfb2652367e120cbf497b32bc78563c6cbbf8936..ee9823ac42551606446af71e8c5572b830d9161f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-aluminium-rocky
+    name: netvirt-csit-hwvtep-openstack-integration-silicon-rocky
     jobs:
       - inttest-csit-hwvtep-openstack-custom
-
     project: "netvirt"
-    stream: "aluminium"
+    stream: "silicon"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"
@@ -51,12 +50,12 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
+    name: netvirt-csit-hwvtep-openstack-integration-silicon-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: "netvirt"
-    stream: "aluminium"
+    stream: "silicon"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"
@@ -102,13 +101,13 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-magnesium-rocky
+    name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein
     jobs:
       - inttest-csit-hwvtep-openstack-custom
 
     project: "netvirt"
-    stream: "magnesium"
-    branch: "stable/magnesium"
+    stream: "aluminium"
+    branch: "stable/aluminium"
     jre: "openjdk11"
     testplan: "{project}-{topology}-l2gw-openstack.txt"
     odl-ml2-driver-version: "v2"
@@ -141,17 +140,16 @@
 
     functionality:
       - upstream-stateful:
-          schedule: "{schedule-weekly}"
+          schedule: "{schedule-daily}"
       - gate-stateful
 
     openstack:
-      - rocky:
-          openstack-branch: "stable/rocky"
-          odl-ml2-branch: "stable/rocky"
+      - stein:
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
           odl-ml2-port-binding: "pseudo-agentdb-binding"
-          openstack_system_image: "{openstack_rocky_system_image}"
-          openstack_system2_image: "{openstack_rocky_system_image}"
-          schedule: "{schedule-daily}"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-magnesium-stein

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index 35c3f93e66ac309ca5bec17b795bcadec269d70b..541bd6b4300313169bc19964de25ce014c439015 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -7,9 +7,6 @@
     project: "netvirt"
 
     stream:
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
       - sodium:
           branch: "stable/sodium"
 
@@ -82,10 +79,10 @@
 
     functionality:
       - upgrade:
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - upgrade-snat-conntrack:
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
 
     openstack:
       - rocky:
@@ -106,6 +103,9 @@
       - magnesium:
           branch: "stable/magnesium"
           jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
 
     testplan: "{project}-{topology}-openstack-upgrade.txt"
     odl-ml2-driver-version: "v2"
@@ -143,14 +143,14 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-upgrade-openstack-integration-stein-aluminium
+    name: netvirt-csit-upgrade-openstack-integration-stein-silicon
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
 
     stream:
-      - aluminium:
+      - silicon:
           branch: "master"
           jre: "openjdk11"
 

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 5ee6901e9f1f315957ce3a0621238d47698138e6..b4262e3772e9ca58ab21038ef457bf61465d9b30 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-aluminium-rocky
+    name: netvirt-csit-openstack-integration-silicon-rocky
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
-    stream: "aluminium"
+    stream: "silicon"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -83,12 +83,12 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-openstack-integration-aluminium-stein
+    name: netvirt-csit-openstack-integration-silicon-stein
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
-    stream: "aluminium"
+    stream: "silicon"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -166,13 +166,13 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-openstack-integration-magnesium-rocky
+    name: netvirt-csit-openstack-integration-aluminium-rocky
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
-    stream: "magnesium"
-    branch: "stable/magnesium"
+    stream: "aluminium"
+    branch: "stable/aluminium"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"
@@ -226,12 +226,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - tempest-stateful-snat-conntrack:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -248,6 +248,89 @@
           openstack_system_image: "{openstack_rocky_system_image}"
           openstack_system2_image: "{openstack_rocky_system_image}"
 
+- project:
+    name: netvirt-csit-openstack-integration-aluminium-stein
+    jobs:
+      - inttest-csit-openstack-custom
+
+    project: "netvirt"
+    stream: "aluminium"
+    branch: "stable/aluminium"
+    jre: "openjdk11"
+    testplan: "{project}-{topology}-openstack.txt"
+    odl-ml2-driver-version: "v2"
+    enable-openstack-services: "placement-api,tempest"
+    enable-openstack-compute-services: "placement-client"
+    security-group-mode: "stateful"
+    odl_system_flavor: odl-highcpu-2
+    openstack_system_flavor: odl-highcpu-8
+    openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 0
+    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-openstack"
+          robot-options: "-v FAIL_ON_EXCEPTIONS:True"
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
+
+    functionality:
+      - upstream-stateful
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: "true"
+      - upstream-stateful-snat-conntrack:
+          odl-snat-mode: "conntrack"
+      - gate-stateful
+      - gate-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: "true"
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: "conntrack"
+      - gate-minimal-cluster:
+          testplan: "{project}-{topology}-minimal-openstack.txt"
+      - dcgw:
+          testplan: "{project}-{topology}-dcgw-openstack.txt"
+          tools_system_count: 3
+          enable-gre-type-driver: "yes"
+      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
+      - gate-tdd-wip:
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
+          schedule: "{schedule-weekly}"
+          tools_system_count: 3
+          enable-gre-type-driver: "yes"
+      - tempest-stateful:
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          schedule: "{schedule-weekly}"
+      - tempest-stateful-snat-conntrack:
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+          schedule: "{schedule-weekly}"
+      - gate-tempest-stateful:
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+      - gate-tempest-stateful-snat-conntrack:
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
+
+    openstack:
+      - stein:
+          openstack-branch: "stable/stein"
+          odl-ml2-branch: "stable/stein"
+          odl-ml2-port-binding: "pseudo-agentdb-binding"
+          openstack_system_image: "{openstack_stein_system_image}"
+          openstack_system2_image: "{openstack_stein_system_image}"
+
 - project:
     name: netvirt-csit-openstack-integration-magnesium-stein
     jobs:
@@ -400,12 +483,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - tempest-stateful-snat-conntrack:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -487,12 +570,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - tempest-stateful-snat-conntrack:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -565,12 +648,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - tempest-stateful-snat-conntrack:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -647,12 +730,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - tempest-stateful-snat-conntrack:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -726,12 +809,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - tempest-stateful-snat-conntrack:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
           odl-snat-mode: "conntrack"
-          schedule: "{schedule-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -749,7 +832,7 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-aluminium
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-silicon
     jobs:
       - inttest-csit-openstack-custom
 
@@ -765,7 +848,7 @@
     os-cmp-cnt: 0
 
     stream:
-      - aluminium:
+      - silicon:
           branch: "master"
           jre: "openjdk11"
 

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index e98c1e681490d6a8190c96124f2a86fc08851f3f..4f01a14db94786223358ada86cf6980e917a1ae4 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -121,27 +121,6 @@
     templates: docker
     update-cloud-image: true
 
-- project:
-    name: packer-gbp-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: gbp
-    update-cloud-image: true
-
 - project:
     name: packer-mininet-ovs-2.5-jobs
     jobs:

diff --git a/packer/provision/gbp.sh b/packer/provision/gbp.sh
deleted file mode 100644 (file)
index 95ba70c..0000000
--- a/packer/provision/gbp.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# vim: sw=4 ts=4 sts=4 et tw=72 :
-
-# force any errors to cause the script and job to end in failure
-set -xeu -o pipefail
-
-# Ensure that necessary variables are set to enable noninteractive mode in
-# commands.
-export DEBIAN_FRONTEND=noninteractive
-
-# additional kernel packages required for docker to fix
-# aufs failed: driver not supported
-echo "---> Installing Additional kernel packages required for docker"
-apt-get update
-apt-get install "linux-image-extra-$(uname -r)" linux-image-extra-virtual
-modprobe aufs
-
-# Install and configure docker. Use puppetlabs docker which supports
-# Ubuntu 16.04
-puppet module install puppetlabs-docker_platform --version 2.2.1
-
-# do the package install via puppet so that we know it actually installs
-# properly and it also makes it quieter but with better error reporting
-echo "---> Installing Group Based Policy requirements"
-puppet apply /tmp/packer/gbp_packages.pp
-
-# configure docker networking so that it does not conflict with LF internal networks
-# configure docker daemon to listen on port 5555 enabling remote managment
-# This has to happen before docker gets installed or things go sideways
-# badly
-cat <<EOL > /etc/default/docker
-# /etc/default/docker
-DOCKER_OPTS='-H unix:///var/run/docker.sock -H tcp://0.0.0.0:5555 --bip=10.250.0.254/24'
-EOL
-
-# docker
-echo "---> Installing docker"
-puppet apply /tmp/packer/docker_setup.pp
-
-echo "---> stopping docker"
-puppet apply -e "service { 'docker': ensure => stopped }"
-
-echo "---> cleaning docker configs that break after snapshotting"
-rm -f /var/lib/docker/repositories-aufs /etc/docker/key.json
-
-# OVS
-echo "---> Installing ovs"
-puppet module install puppetlabs-vcsrepo
-puppet apply /tmp/packer/ovs_setup.pp
-
-pushd /root/ovs
-DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary | \
- grep 'dpkg-deb: building package'
-popd
-
-# Note this does not actually install OVS. Everytime we've tried to do
-# that the snapshot system hangs on spin-up for some reason. As such the
-# final installation will have to be left as a spin-up task
-
-# The following is what should be used in the spin-up task
-# dpkg --install /root/openvswitch-datapath-dkms* && dpkg --install /root/openvswitch-{common,switch}*

diff --git a/packer/provision/gbp_puppet/docker_setup.pp b/packer/provision/gbp_puppet/docker_setup.pp
deleted file mode 100644 (file)
index 4a3a66e..0000000
--- a/packer/provision/gbp_puppet/docker_setup.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#include docker
-class { 'docker':
-  tcp_bind         => 'tcp://0.0.0.0:5555',
-  extra_parameters => '--bip=10.250.0.254/24',
-}

diff --git a/packer/provision/gbp_puppet/gbp_packages.pp b/packer/provision/gbp_puppet/gbp_packages.pp
deleted file mode 100644 (file)
index 6d97a33..0000000
--- a/packer/provision/gbp_puppet/gbp_packages.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-package { [
-  'software-properties-common',
-  'python-software-properties',
-  'python-pip',
-  'python-virtualenv',
-  'git-core',
-  'git',
-  'curl',
-  'bridge-utils',
-  'python-ipaddr']:
-  ensure => present,
-}

diff --git a/packer/provision/gbp_puppet/ovs_setup.pp b/packer/provision/gbp_puppet/ovs_setup.pp
deleted file mode 100644 (file)
index e475770..0000000
--- a/packer/provision/gbp_puppet/ovs_setup.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-package { [
-    'build-essential',
-    'fakeroot',
-    'debhelper',
-    'autoconf',
-    'automake',
-    'libssl-dev',
-    'bzip2',
-    'openssl',
-    'graphviz',
-    'python-all',
-    'procps',
-    'python-qt4',
-    'python-zopeinterface',
-    'python-twisted-conch',
-    'libtool',
-    "linux-headers-${::releaseversion}",
-    'dkms',
-  ]:
-  ensure => present,
-}
-
-vcsrepo { '/root/ovs':
-  ensure   => present,
-  provider => git,
-  source   => 'https://github.com/pritesh/ovs.git',
-  revision => 'nsh-v8',
-}
-
-

diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
deleted file mode 100644 (file)
index 84ebbbe..0000000
--- a/packer/templates/gbp.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "variables": {
-    "ansible_roles_path": ".galaxy",
-    "arch": "x86_64",
-    "base_image": null,
-    "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": "",
-    "distro": null,
-    "flavor": "v2-highcpu-1",
-    "ssh_user": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - gbp - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
-      "instance_name": "{{user `distro`}}-gbp-{{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`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "flavor": "{{user `flavor`}}",
-      "metadata": {
-        "ci_managed": "yes"
-      },
-      "use_blockstorage_volume": "{{user `vm_use_block_storage`}}",
-      "volume_size": "{{user `vm_volume_size`}}",
-      "image_disk_format": "{{user `vm_image_disk_format`}}"
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "inline": ["mkdir -p /tmp/packer"]
-    },
-    {
-      "type": "file",
-      "source": "provision/gbp_puppet/",
-      "destination": "/tmp/packer"
-    },
-    {
-      "type": "shell",
-      "scripts": [
-        "provision/baseline.sh",
-        "provision/gbp.sh",
-        "provision/system_reseal_local_env.sh",
-        "provision/system_reseal.sh"
-      ],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    }
-  ]
-}