Merge "Add plots to netconf-scale-max-devices job"

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 007b17aa7418701c551163b5bbc72d3e9f8218ff..6b06986b45a8366cc8e61e84c6dbb0228d7e20c1 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,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180601-2050
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20190430-080312.962
 HARDWARE_ID=odl-standard-2
 INSTANCE_CAP=25

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
index 103c573cfc4459b513f643ed5521dc4971fcc9df..5230f4ef42bb5527b750d4fde5ce24934994aac1 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180601-2050
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20190430-080312.962
 HARDWARE_ID=v1-standard-1
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
index 8f1e4fb790d3d9a551e424f8f88632f389b88b45..0a149392c76256032fb480a75c960c609bd293f5 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180601-2050
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20190430-080312.962
 HARDWARE_ID=v1-standard-1
 INSTANCE_CAP=1
 NUM_EXECUTORS=4

diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml
index 7a5aec9b5db06c67fbe2b4ae65031ed23f553a1c..e78f608c9f181f16fca6e5d269884bac82e952ca 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -42,23 +42,6 @@
     platforms: centos-7
     templates: devstack
 
-- project:
-    name: packer-devstack-pre-pip-pike-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: centos-7
-    templates: devstack-pre-pip-pike
-
 - project:
     name: packer-devstack-pre-pip-queens-jobs
     jobs:

diff --git a/packer/templates/devstack-pre-pip-pike.json b/packer/templates/devstack-pre-pip-pike.json
deleted file mode 100644 (file)
index eed09e6..0000000
--- a/packer/templates/devstack-pre-pip-pike.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "variables": {
-    "base_image": null,
-    "distro": null,
-    "cloud_network": null,
-    "cloud_user_data": null,
-    "ssh_user": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "type": "openstack",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `ssh_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-150405.000\"}}",
-      "instance_name": "{{user `distro`}}-devstack-pike-{{uuid}}",
-      "source_image_name": "{{user `base_image`}}",
-      "flavor": "v1-standard-1",
-      "networks": [
-        "{{user `cloud_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}",
-      "metadata": {
-        "ci_managed": "yes"
-      }
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "environment_vars": [
-        "os_branch=stable/pike",
-        "rdo_branch=pike"
-      ],
-      "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"
-    }
-  ]
-}