From: Thanh Ha (zxiiro) <zxiiro@gmail.com>
Date: Fri, 3 May 2019 17:35:26 +0000 (+0000)
Subject: Merge "Add plots to netconf-scale-max-devices job"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=976eae804e7811f56f6622144171ec4adbb94bb1;hp=2de162357b5ce92152e8806bd092baebe70f4432;p=releng%2Fbuilder.git

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 007b17aa7..6b06986b4 100644
--- 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 103c573cf..5230f4ef4 100644
--- 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 8f1e4fb79..0a149392c 100644
--- 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 7a5aec9b5..e78f608c9 100644
--- 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
index eed09e63a..000000000
--- 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"
-    }
-  ]
-}