Merge "Remove packer jobs for Ubuntu 18.04 OVS 25, 26"

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index a514a053afc44b2c40e6c47c26b97fdd44751535..094056b850f4e6d2cb4670641ca8a66ae2b97f43 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -120,44 +120,6 @@
     templates: docker
     update-cloud-image: true
 
-- project:
-    name: packer-mininet-ovs-2.5-jobs
-    jobs:
-      - gerrit-packer-merge
-
-    project: releng/builder
-    project-name: builder
-    branch: master
-    archive-artifacts: "**/*.log"
-
-    build-node: centos7-builder-2c-1g
-    build-timeout: 60
-    cron: "00 H 1 * *"
-
-    platforms:
-      - ubuntu-18.04
-    templates: mininet-ovs-2.5
-    update-cloud-image: true
-
-- project:
-    name: packer-mininet-ovs-2.6-jobs
-    jobs:
-      - gerrit-packer-merge
-
-    project: releng/builder
-    project-name: builder
-    branch: master
-    archive-artifacts: "**/*.log"
-
-    build-node: centos7-builder-2c-1g
-    build-timeout: 75
-    cron: "00 H 1 * *"
-
-    platforms:
-      - ubuntu-18.04
-    templates: mininet-ovs-2.6
-    update-cloud-image: true
-
 - project:
     name: packer-mininet-ovs-2.8-jobs
     jobs:

diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
deleted file mode 100644 (file)
index 6b46057..0000000
--- a/packer/templates/mininet-ovs-2.5.json
+++ /dev/null
@@ -1,60 +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",
-    "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": "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`}}",
-      "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",
-      "scripts": ["common-packer/provision/install-python.sh"],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    },
-    {
-      "type": "shell-local",
-      "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}"
-    },
-    {
-      "type": "ansible",
-      "playbook_file": "provision/mininet-ovs-2.5.yaml",
-      "ansible_env_vars": [
-        "ANSIBLE_NOCOWS=1",
-        "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
-        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
-        "ANSIBLE_STDOUT_CALLBACK=debug"
-      ]
-    }
-  ]
-}

diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json
deleted file mode 100644 (file)
index 493541b..0000000
--- a/packer/templates/mininet-ovs-2.6.json
+++ /dev/null
@@ -1,60 +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",
-    "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": "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`}}",
-      "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",
-      "scripts": ["common-packer/provision/install-python.sh"],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    },
-    {
-      "type": "shell-local",
-      "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}"
-    },
-    {
-      "type": "ansible",
-      "playbook_file": "provision/mininet-ovs-2.6.yaml",
-      "ansible_env_vars": [
-        "ANSIBLE_NOCOWS=1",
-        "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
-        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
-        "ANSIBLE_STDOUT_CALLBACK=yaml"
-      ]
-    }
-  ]
-}