cloud-infra: Delete keypairs upon completion of the job

Change-Id: Ic222cc1e300d6d1502b7f1abc598228af2263e48

diff --git a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
index 33447806d972787c0136539dd262664475962e74..e825ef829bae7ec041a63a29365a94932c8264ec 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
+++ b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml
@@ -124,6 +124,10 @@
           name: STACK_NAME
           default: "nordix-cicd-verify-engine-{distro}-$BUILD_NUMBER"
           description: 'Name of the created stack'
+      - string:
+          name: KEYPAIR_NAME
+          default: "keypair-nordix-cicd-verify-engine-{distro}-$BUILD_NUMBER"
+          description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
@@ -226,6 +230,7 @@
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 CLEANUP=$CLEANUP
@@ -248,6 +253,7 @@
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 TEST_SUITE=$TEST_SUITE

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index a0f2fcae582e0f1c1b0b89e35b6ed59179c260ab..878e00d5b54ecff56df317bda46a80de2160de69 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -143,6 +143,9 @@
       - string:
           name: STACK_NAME
           default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
+      - string:
+          name: KEYPAIR_NAME
+          default: 'keypair-nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
       - string:
           name: HEAT_ENVIRONMENT_FILENAME
           default: "heat-environment-{cloud}-{distro}-full.yaml"
@@ -232,6 +235,7 @@
                 ONAP_FLAVOR=$ONAP_FLAVOR
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -262,6 +266,7 @@
                 TEST_TYPE=oom-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -293,6 +298,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -319,6 +325,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -345,6 +352,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -371,6 +379,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -397,6 +406,7 @@
                 TEST_TYPE=onap-healthcheck
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -427,6 +437,7 @@
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
                 POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
+                KEYPAIR_NAME=$KEYPAIR_NAME
                 HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC

diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh
index b732de44601743e61042cc4e8f5f84606356845e..efec47b77b0af7f076304a79e25d4c9dec599618 100644 (file)
--- a/jjb/cloud-infra/delete-heat-stack.sh
+++ b/jjb/cloud-infra/delete-heat-stack.sh
@@ -60,11 +60,12 @@ set +u
 source $WORKSPACE/.venv/bin/activate
 set -u
 pip install -q openstacksdk python-openstackclient python-heatclient
-echo "Info: Deleting stack $STACK_NAME"
+echo "Info: Deleting stack $STACK_NAME and keypair $KEYPAIR_NAME"
 echo "-------------------------------------------------------------------------"
 source /tmp/openrc && /bin/rm -f /tmp/openrc
 openstack stack delete $STACK_NAME --wait --yes
+openstack keypair delete $KEYPAIR_NAME
 echo "-------------------------------------------------------------------------"
-echo "Info: Stack $STACK_NAME has been deleted!"
+echo "Info: Stack $STACK_NAME and keypair $KEYPAIR_NAME have been deleted!"
 
 # vim: set ts=2 sw=2 expandtab: