Merge "Removing all deployments envs instead of snapshot of one job"

This commit is contained in:
Jenkins 2017-02-07 11:01:19 +00:00 committed by Gerrit Code Review
commit 5a6f96a650
4 changed files with 12 additions and 12 deletions

View File

@ -1,14 +1,14 @@
#!/bin/bash -ex #!/bin/bash -ex
# Removes snapshots of fuel-devops envs. # Removes all fuel-devops deployment envs.
# CONFIGURATION: # CONFIGURATION:
###################################################### ######################################################
FUEL_DEVOPS_INSTALLATION_DIR="/home/jenkins/venv-fuel-devops-3.0" FUEL_DEVOPS_INSTALLATION_DIR="/home/jenkins/venv-fuel-devops-3.0"
: ${FUEL_DEVOPS_ENV_NAME:="ccp-simple-deployment-env"}
: ${FUEL_SNAPSHOT_NAME:="fresh"}
source "${FUEL_DEVOPS_INSTALLATION_DIR}"/bin/activate source "${FUEL_DEVOPS_INSTALLATION_DIR}"/bin/activate
dos.py snapshot-delete "${FUEL_DEVOPS_ENV_NAME}" "${FUEL_SNAPSHOT_NAME}" for f in `dos.py list | grep deployment`; do
dos.py erase "${f}";
done

View File

@ -1,12 +1,12 @@
- job: - job:
name: remove-all-snapshots name: remove-all-simple-deployment-envs
description: | description: |
This job will trigger jobs for removing K8s snaphosts on all slaves. This job will trigger jobs for removing all simple deployment envs on all slaves.
builders: builders:
- shell: | - shell: |
echo "Removing snaphosts on slaves" echo "Removing simple deployment envs from all slaves"
- trigger-builds: - trigger-builds:
- project: "remove-snapshots-simple-deployment" - project: "remove-simple-deployment-envs"
parameter-factories: parameter-factories:
- factory: allnodesforlabel - factory: allnodesforlabel
name: NODE name: NODE

View File

@ -1,18 +1,18 @@
- job: - job:
name: remove-snapshots-simple-deployment name: remove-simple-deployment-envs
builders: builders:
- inject: - inject:
properties-content: | properties-content: |
FUEL_DEVOPS_ENV_NAME=ccp-simple-deployment-env FUEL_DEVOPS_ENV_NAME=ccp-simple-deployment-env
FUEL_DEVOPS_SNAPSHOT_NAME=fresh FUEL_DEVOPS_SNAPSHOT_NAME=fresh
- shell: - shell:
!include-raw 'builders/remove-snapshots.sh' !include-raw 'builders/remove-simple-deployment-envs.sh'
concurrent: true concurrent: true
properties: properties:
- heavy-job: - heavy-job:
weight: 6 weight: 6
description: | description: |
Removes snapshot of K8s env for fuel-ccp simple deployment test. Removes envs for simple deployment tests.
logrotate: logrotate:
daysToKeep: 14 daysToKeep: 14
parameters: parameters:

View File

@ -9,7 +9,7 @@
- shell: - shell:
!include-raw 'builders/update-vm-ubuntu-image.sh' !include-raw 'builders/update-vm-ubuntu-image.sh'
- trigger-builds: - trigger-builds:
- project: "remove-snapshots-simple-deployment" - project: "remove-simple-deployment-envs"
same-node: true same-node: true
current-parameters: true current-parameters: true
concurrent: true concurrent: true