From 788ac6c3b53cc9456ffc85878d17f7074a7aef91 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Sun, 21 Jan 2018 20:00:50 -0500
Subject: [PATCH] Move cleanup stale stacks job into openstack-cron

Moves the cleanup stale stacks job into the openstack-cron
job in an effort to consolidate jobs to save cloud resources.

Change-Id: I3dabdb8b4bc2d08d4cec99bd4e47a799a5b1373e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 ... => odl-openstack-cleanup-stale-stacks.sh} |  6 +--
 jjb/releng-jobs.yaml                          | 51 ++++---------------
 jjb/releng-macros.yaml                        |  5 ++
 3 files changed, 16 insertions(+), 46 deletions(-)
 rename jjb/{opendaylight-infra-cleanup-stale-stacks.sh => odl-openstack-cleanup-stale-stacks.sh} (96%)

diff --git a/jjb/opendaylight-infra-cleanup-stale-stacks.sh b/jjb/odl-openstack-cleanup-stale-stacks.sh
similarity index 96%
rename from jjb/opendaylight-infra-cleanup-stale-stacks.sh
rename to jjb/odl-openstack-cleanup-stale-stacks.sh
index 6f00ac81b..16559c9fe 100644
--- a/jjb/opendaylight-infra-cleanup-stale-stacks.sh
+++ b/jjb/odl-openstack-cleanup-stale-stacks.sh
@@ -11,14 +11,10 @@
 # Cleanup stale stacks in the cloud
 # Requires the variable JENKINS_URLS declared in the job as a space separated
 # list of Jenkins instances to check for active builds.
+echo "---> Cleanup stale stacks"
 
-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
 
 stack_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 81241f748..b4462739b 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -11,7 +11,6 @@
       # OpenStack Related
       - 'builder-delete-orphaned-nodes'
       - 'builder-delete-stale-nodes'
-      - 'builder-delete-stale-stacks'
       # Automation for docs and jobs
       - 'builder-update-image-list'
 
@@ -25,6 +24,9 @@
     archive-artifacts: '**/*.log'
     build-timeout: 30
     jjb-version: 2.0.0
+    jenkins-urls: >
+      https://jenkins.opendaylight.org/releng
+      https://jenkins.opendaylight.org/sandbox
 
 - project:
     name: packer-jobs
@@ -183,6 +185,10 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - string:
+          name: JENKINS_URLS
+          default: '{jenkins-urls}'
+          description: 'Space separated list of Jenkins URLs to check for active builds'
 
     scm:
       - git-scm:
@@ -204,6 +210,9 @@
     builders:
       - odl-openstack-install
       - shell: !include-raw-escape: global-jjb/shell/lftools-install.sh
+      # Servers
+      - odl-openstack-cleanup-stale-stacks
+      # Images
       - odl-openstack-check-image-protection
       - odl-openstack-cleanup-old-images
 
@@ -286,46 +295,6 @@
           email-prefix: '[releng]'
       - lf-infra-publish
 
-
-- job-template:
-    name: 'builder-delete-stale-stacks'
-    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 stacks every 30 mins in case we have orphaned stacks
-      - timed: '0,30 * * * *'
-
-    builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.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 2aea5073e..3ea477cc3 100644
--- 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-stale-stacks
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh
+
 - builder:
     # Deploys a maven site to Nexus using lftools nexus-zip command
     name: opendaylight-infra-deploy-maven-site
-- 
2.36.6