From 95aab7d30e1a8a154dfadef70094180ce0835404 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 9 Jun 2020 14:25:45 +0200 Subject: [PATCH] validation: Enable validation for REC in UNH lab Add new jobs for running the validation jobs on the REC POD in UNH lab, similar to running validation jobs on the IEC PODs in Enea lab. The new job(s) will upload the logs to nexus.akraino.org in the 'unh' lab silo. Change-Id: I99fcc4854ead367fad8d203eb448908b229d6781 Signed-off-by: Alexandru Avadanii --- jjb/akraino-templates/akraino-rec-macros.yaml | 17 ++++++++++++++++- jjb/akraino-templates/akraino-rec-templates.yaml | 16 ++++++++++++++-- jjb/validation/lab.yaml | 1 + 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/jjb/akraino-templates/akraino-rec-macros.yaml b/jjb/akraino-templates/akraino-rec-macros.yaml index bf95721..a1129b8 100644 --- a/jjb/akraino-templates/akraino-rec-macros.yaml +++ b/jjb/akraino-templates/akraino-rec-macros.yaml @@ -26,6 +26,22 @@ default: 'refs/heads/master' description: 'remote-installer custom git refspec' +- parameter: + name: 'rec-defaults' + parameters: + - string: + name: CLUSTER_MASTER_IP + default: '192.167.10.211' + description: 'IP address to connect to the K8s master' + - string: + name: CLUSTER_SSH_USER + default: 'cloudadmin' + description: 'SSH username to connect to the K8s master' + - string: + name: CLUSTER_SSH_PASSWORD + default: 'admin' + description: 'SSH password to connect to the K8s master' + ######################## # trigger macros ######################## @@ -33,4 +49,3 @@ name: 'rec-weekly-master-trigger' triggers: - timed: '0 1 * * 6,7' - diff --git a/jjb/akraino-templates/akraino-rec-templates.yaml b/jjb/akraino-templates/akraino-rec-templates.yaml index 6b26659..1f02ef8 100644 --- a/jjb/akraino-templates/akraino-rec-templates.yaml +++ b/jjb/akraino-templates/akraino-rec-templates.yaml @@ -24,7 +24,8 @@ project: '{project}' stream: '{stream}' branch: '{branch}' - - '{project}-{slave-label}-defaults' + - 'rec-{slave-label}-defaults' + - 'rec-defaults' builders: - description-setter: @@ -34,6 +35,16 @@ current-parameters: true same-node: true block: true + - trigger-builds: + - project: 'validation-unh-daily-{stream}' + same-node: true + current-parameters: true + predefined-parameters: | + BLUEPRINT={project-name} + VERSION=master + OPTIONAL=false + PULL=yes + block: true publishers: &rec-publishers - email: @@ -57,7 +68,8 @@ project: '{project}' stream: '{stream}' branch: '{branch}' - - '{project}-{slave-label}-defaults' + - 'rec-{slave-label}-defaults' + - 'rec-defaults' scm: - ta-lf-infra-gerrit-scm: diff --git a/jjb/validation/lab.yaml b/jjb/validation/lab.yaml index e29f46a..c31838b 100644 --- a/jjb/validation/lab.yaml +++ b/jjb/validation/lab.yaml @@ -27,5 +27,6 @@ disabled: false validation_lab: - enea + - unh jobs: - akraino-validation-lab-daily -- 2.16.6