summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2019-11-05 13:45:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-11-05 13:45:43 +0000
commit54e2f60a8b0027f9c922eac95f5ac2f38604fde5 (patch)
treec147c46aeec7b12f6b98b195cf83f8de15dea908 /jjb
parent037d520a19c80902a99c6e75f569090b96ec9b0f (diff)
parent600548d4df9d788585aaa6549bcab38c0f34d9ee (diff)
Merge "Moves LaaS Jobs to New Project"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/ci_gate_security/opnfv-ci-gate-security.yaml1
-rw-r--r--jjb/global/releng-macros.yaml11
-rw-r--r--jjb/global/slave-params.yaml4
-rw-r--r--jjb/laas/laas.yml (renamed from jjb/pharos/pharos-tools.yml)24
-rw-r--r--jjb/laas/shell/backup-dashboard.sh (renamed from jjb/pharos/shell/backup-dashboard.sh)12
-rw-r--r--jjb/laas/shell/deploy-dashboard.sh (renamed from jjb/pharos/shell/deploy-dashboard.sh)4
-rw-r--r--jjb/releng/opnfv-docker.yaml14
7 files changed, 37 insertions, 33 deletions
diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 45e6db5a0..649538e69 100644
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
@@ -48,7 +48,6 @@
- ovsnfv
- parser
- pharos
- - pharos-tools
- promise
- qtip
- releng
diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index cb6f0f285..5b1bdee0a 100644
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -856,9 +856,14 @@
<<: *email_ptl_defaults
recipients: >
jack@jento.io
-- publisher:
- name: 'email-pharos-tools-ptl'
- <<: *email_pharos_ptl_defaults
+
+- publisher: &email_laas_ptl_defaults
+ name: 'email-laas-ptl'
+ publishers:
+ - email-ext:
+ <<: *email_laas_ptl_defaults
+ recipients: >
+ pberberian@iol.unh.edu
- publisher:
name: 'email-promise-ptl'
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index d721ff268..b597b30e0 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -539,11 +539,11 @@
description: "Directory where the build artifact will be located upon the completion of the build."
- parameter:
- name: 'pharos-dashboard-defaults'
+ name: 'laas-dashboard-defaults'
parameters:
- label:
name: SLAVE_LABEL
- default: 'pharos-dashboard2'
+ default: 'laas-dashboard'
description: 'Slave label on Jenkins'
all-nodes: false
node-eligibility: 'ignore-offline'
diff --git a/jjb/pharos/pharos-tools.yml b/jjb/laas/laas.yml
index e28d0be6f..76c475eab 100644
--- a/jjb/pharos/pharos-tools.yml
+++ b/jjb/laas/laas.yml
@@ -1,9 +1,9 @@
---
- project:
- name: pharos-dashboard-jobs
+ name: laas-dashboard-jobs
- project: 'pharos-tools'
- project-name: 'pharos-tools'
+ project: 'laas'
+ project-name: 'laas'
stream:
- master
@@ -11,14 +11,14 @@
disabled: false
jobs:
- - 'pharos-dashboard-backup'
- - 'pharos-dashboard-deploy'
+ - 'laas-dashboard-backup'
+ - 'laas-dashboard-deploy'
- project:
- name: pharos-dashboard-verify
+ name: laas-dashboard-verify
- project: 'pharos-tools'
- project-name: 'pharos-tools'
+ project: 'laas'
+ project-name: 'laas'
build-days-to-keep: 7
tox-dir: 'dashboard'
@@ -31,12 +31,12 @@
- 'gerrit-tox-verify'
- job-template:
- name: 'pharos-dashboard-backup'
+ name: 'laas-dashboard-backup'
disabled: '{obj:disabled}'
parameters:
- - 'pharos-dashboard-defaults'
+ - 'laas-dashboard-defaults'
triggers:
- timed: '@daily'
@@ -46,7 +46,7 @@
!include-raw: shell/backup-dashboard.sh
- job-template:
- name: 'pharos-dashboard-deploy'
+ name: 'laas-dashboard-deploy'
disabled: '{obj:disabled}'
@@ -54,7 +54,7 @@
- project-parameter:
project: '{project}'
branch: 'master'
- - 'pharos-dashboard-defaults'
+ - 'laas-dashboard-defaults'
scm:
- git-scm-gerrit
diff --git a/jjb/pharos/shell/backup-dashboard.sh b/jjb/laas/shell/backup-dashboard.sh
index 4c1c01500..39f5be4e4 100644
--- a/jjb/pharos/shell/backup-dashboard.sh
+++ b/jjb/laas/shell/backup-dashboard.sh
@@ -10,19 +10,19 @@
BACKUP_DIR=$HOME/backups
DATE=$(date +%Y%m%d)
-TAR_FILE=pharos-dashboard-db-$DATE.tar.tz
+TAR_FILE=laas-dashboard-db-$DATE.tar.tz
mkdir -p $BACKUP_DIR
echo "-- $DATE --"
-echo "--> Backing up Pharos Dashboard"
+echo "--> Backing up Lab as a Service Dashboard"
docker run --rm \
- -v pharos-data:/pharos-data:ro \
+ -v laas-data:/laas-data:ro \
-v $BACKUP_DIR:/backup \
alpine \
- tar -czf /backup/$TAR_FILE -C /pharos-data ./
+ tar -czf /backup/$TAR_FILE -C /laas-data ./
/usr/local/bin/gsutil cp $BACKUP_DIR/$TAR_FILE \
- gs://opnfv-backups/pharos-dashboard/ && rm $BACKUP_DIR/$TAR_FILE
+ gs://opnfv-backups/laas-dashboard/ && rm $BACKUP_DIR/$TAR_FILE
-echo "--> Pharos dashboard backup complete"
+echo "--> LAAS dashboard backup complete"
diff --git a/jjb/pharos/shell/deploy-dashboard.sh b/jjb/laas/shell/deploy-dashboard.sh
index 46a79c326..d3ad29b31 100644
--- a/jjb/pharos/shell/deploy-dashboard.sh
+++ b/jjb/laas/shell/deploy-dashboard.sh
@@ -15,5 +15,5 @@ docker-compose up -d
# Copy JIRA keys into web container
WEB_CONTAINER="$(docker ps --filter 'name=dg01' -q)"
-docker cp $HOME/rsa.pub $WEB_CONTAINER:/pharos_dashboard/account/
-docker cp $HOME/rsa.pem $WEB_CONTAINER:/pharos_dashboard/account/
+docker cp $HOME/rsa.pub $WEB_CONTAINER:/laas_dashboard/account/
+docker cp $HOME/rsa.pem $WEB_CONTAINER:/laas_dashboard/account/
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 85ddbf09e..f284843cb 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -15,7 +15,7 @@
stream: hunter
branch: 'stable/{stream}'
disabled: false
- pharos-tools-receivers: &pharos_tools_receivers
+ laas-receivers: &laas_receivers
receivers: >
pberberian@iol.unh.edu
sbergeron@iol.unh.edu
@@ -200,18 +200,18 @@
project: 'nfvbench'
<<: *master
<<: *other-receivers
- - 'pharos-tools-laas-dashboard':
- project: 'pharos-tools'
+ - 'laas-dashboard':
+ project: 'laas'
dockerdir: 'dashboard'
dockerfile: 'web/Dockerfile'
<<: *master
- <<: *pharos_tools_receivers
- - 'pharos-tools-laas-celery':
- project: 'pharos-tools'
+ <<: *laas_receivers
+ - 'laas-celery':
+ project: 'laas'
dockerdir: 'dashboard'
dockerfile: 'worker/Dockerfile'
<<: *master
- <<: *pharos_tools_receivers
+ <<: *laas_receivers
- 'qtip':
project: 'qtip'
dockerdir: '.'