Merge "Move cleanup orphaned nodes into openstack-cron"

diff --git a/jjb/opendaylight-infra-cleanup-orphaned-nodes.sh b/jjb/odl-openstack-cleanup-orphaned-nodes.sh
similarity index 91%
rename from jjb/opendaylight-infra-cleanup-orphaned-nodes.sh
rename to jjb/odl-openstack-cleanup-orphaned-nodes.sh
index 1a832fe092782c4f3dd0d7f32c8cc0ba57e96d29..953dadc81cded07e11715ce8beb1f77d54e9fa56 100644 (file)
--- a/jjb/opendaylight-infra-cleanup-orphaned-nodes.sh
+++ b/jjb/odl-openstack-cleanup-orphaned-nodes.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
-# Copyright (c) 2017 The Linux Foundation and others.
+# Copyright (c) 2017 - 2018 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -10,13 +10,8 @@
 ##############################################################################
 echo "---> Cleanup orphaned servers"
 
-virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
-pip install --upgrade pip
-pip install --upgrade python-openstackclient python-heatclient
-pip install --upgrade pipdeptree
-pipdeptree
 
 minion_in_jenkins() {
     # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 9e2b8d30adf6a54c1b15a86fe7b66414efdab777..bf8f32c41708b829556e14915f0b9c4521593d57 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -8,8 +8,6 @@
       - builder-copy-sandbox-logs
       - builder-openstack-cron
       - gerrit-tox-verify
-      # OpenStack Related
-      - 'builder-delete-orphaned-nodes'
       # Automation for docs and jobs
       - 'builder-update-image-list'
 
@@ -212,6 +210,7 @@
       # Servers
       - odl-openstack-cleanup-stale-stacks
       - odl-openstack-cleanup-stale-nodes
+      - odl-openstack-cleanup-orphaned-nodes
       # Images
       - odl-openstack-check-image-protection
       - odl-openstack-cleanup-old-images
@@ -219,45 +218,6 @@
     publishers:
       - lf-infra-publish
 
-
-- job-template:
-    name: builder-delete-orphaned-nodes
-    project-type: freestyle
-    node: centos7-builder-2c-1g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - string:
-          name: JENKINS_URLS
-          default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox'
-          description: 'Space separated list of Jenkins URLs to check for active builds'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # Attempt to clear up servers every 30 mins in case we have orphaned servers
-      - timed: '0,30 * * * *'
-
-    builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-orphaned-nodes.sh
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 3c824fb113ea4b7f7eb865cd29f9abed8a72a30d..016c65afb5a0ce9934e3f9cdbe42ec197ae80f35 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -299,6 +299,11 @@
     builders:
       - shell: !include-raw: odl-openstack-cleanup-old-images.sh
 
+- builder:
+    name: odl-openstack-cleanup-orphaned-nodes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-orphaned-nodes.sh
+
 - builder:
     name: odl-openstack-cleanup-stale-nodes
     builders: