Remove devstack mitaka images

Change-Id: I8b00aef03a016155e123ab80c0edbcdaaa94ae00
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 8d981d718999b92b40c99eaa4100640bdf173094..a327ce81e0550040230aaab6f2da25a0c11bd359 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -21,7 +21,6 @@
 
     templates:
       - devstack
-      - devstack-pre-pip-mitaka
       - devstack-pre-pip-newton
       - docker
       - gbp
@@ -41,8 +40,6 @@
         templates: java-builder
       - platforms: ubuntu-14.04
         templates: robot
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-mitaka
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-14.04
@@ -55,8 +52,6 @@
         templates: java-builder
       - platforms: ubuntu-16.04
         templates: robot
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-mitaka
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-16.04

diff --git a/packer/provision/devstack-pre-pip.sh b/packer/provision/devstack-pre-pip.sh
index a91d7619d68d843467b6a73d0153f402bf5189e9..42bcbca17c8160c9489b6642c39375e3826d62a9 100644 (file)
--- a/packer/provision/devstack-pre-pip.sh
+++ b/packer/provision/devstack-pre-pip.sh
@@ -43,15 +43,9 @@ do
     pip install -c requirements/upper-constraints.txt -r ${proj}/test-requirements.txt
 done
 
-if [ "$branch" == "stable/mitaka" ] || [ "$branch" == "stable/liberty" ]; then
-    # the newton release has ovs 2.5.0
-    echo '---> Installing openvswitch from openstack Newton repo (2.5.0)'
-    yum install -y http://rdoproject.org/repos/openstack-newton/rdo-release-newton.rpm
-else
-    # the ocata release has ovs 2.6.1
-    echo '---> Installing openvswitch from openstack Ocata repo (2.6.1)'
-    yum install -y http://rdoproject.org/repos/openstack-ocata/rdo-release-ocata.rpm
-fi
+# the ocata release has ovs 2.6.1
+echo '---> Installing openvswitch from openstack Ocata repo (2.6.1)'
+yum install -y http://rdoproject.org/repos/openstack-ocata/rdo-release-ocata.rpm
 
 yum install -y --nogpgcheck openvswitch
 

diff --git a/packer/templates/devstack-pre-pip-mitaka.json b/packer/templates/devstack-pre-pip-mitaka.json
deleted file mode 100644 (file)
index 9c2ac20..0000000
--- a/packer/templates/devstack-pre-pip-mitaka.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
-    "distro": null,
-    "cloud_user_data": null
-  },
-  "builders": [
-    {
-      "type": "openstack",
-      "name": "public_cloud",
-      "identity_endpoint": "{{user `public_auth_url`}}",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
-      "region": "DFW",
-      "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack-mitaka - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `public_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack-mitaka - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "environment_vars": [
-        "os_branch=stable/mitaka"
-      ],
-      "scripts": [
-        "provision/baseline.sh",
-        "provision/devstack-pre-pip.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"
-    }
-  ]
-}