From d1dc394b83c8f19a7936e629c5b651dfac7eaf44 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Wed, 4 Oct 2017 15:58:38 +0100
Subject: jjb: xci: Refactor bifrost jobs to use the XCI clean VM

We no longer run opnfv/bifrost jobs so drop all the references from
the configuration file. Moreover, make use of the releng-xci XCI clean
VM virtual machine to run the tests on a clean environment. Finally, we
drop the support for uploading logs to the artifacts.opnfv.org. This
needs to be done for XCI as well so we will bring it back when we
develop a universal solution.

Change-Id: I9bad17508ab8ee6594aec444ab864b99331b616d
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
 jjb/xci/bifrost-verify-jobs.yml | 58 +++++------------------------------------
 1 file changed, 6 insertions(+), 52 deletions(-)

(limited to 'jjb/xci/bifrost-verify-jobs.yml')

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index 137787d7a..5f0b6572a 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -8,16 +8,6 @@
       - master:
           branch: '{stream}'
     # -------------------------------
-    # projects
-    # -------------------------------
-    project:
-      - 'openstack':
-          project-repo: 'https://git.openstack.org/openstack/bifrost'
-          clone-location: '$WORKSPACE/bifrost'
-      - 'opnfv':
-          project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
-          clone-location: '$WORKSPACE/releng-xci'
-    # -------------------------------
     # distros
     # -------------------------------
     distro:
@@ -48,7 +38,7 @@
     # jobs
     # -------------------------------
     jobs:
-      - '{project}-bifrost-verify-{distro}-{type}-{stream}'
+      - 'openstack-bifrost-verify-{distro}-{type}-{stream}'
 
 # -------------------------------
 # VM defaults
@@ -67,7 +57,7 @@
 # job templates
 # -------------------------------
 - job-template:
-    name: '{project}-bifrost-verify-{distro}-{type}-{stream}'
+    name: 'openstack-bifrost-verify-{distro}-{type}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -84,15 +74,12 @@
           block-level: 'NODE'
 
     parameters:
-      - string:
-          name: PROJECT
-          default: '{project}'
       - string:
           name: PROJECT_REPO
-          default: '{project-repo}'
+          default: 'https://git.openstack.org/openstack/bifrost'
       - string:
           name: CLONE_LOCATION
-          default: '{clone-location}'
+          default: '$WORKSPACE/bifrost'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -134,12 +121,7 @@
           default: 'true'
       - label:
           name: SLAVE_LABEL
-          default: 'infra-{type}-{distro}'
-      # yamllint disable rule:line-length
-      - string:
-          name: BIFROST_LOG_URL
-          default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
-      # yamllint enable rule:line-length
+          default: 'xci-virtual'
       - string:
           name: XCI_LOOP
           default: 'verify'
@@ -156,7 +138,7 @@
           wipe-workspace: true
 
     triggers:
-      - '{project}-gerrit-trigger':
+      - 'openstack-gerrit-trigger':
           branch: '{branch}'
 
     builders:
@@ -190,7 +172,6 @@
                 exclude-no-code-change: 'false'
             - comment-added-contains-event:
                 comment-contains-value: 'recheck'
-          custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
           silent-start: true
           projects:
             - project-compare-type: 'PLAIN'
@@ -206,33 +187,6 @@
                   pattern: 'releasenotes/**'
           readable-message: true
 
-- trigger:
-    name: 'opnfv-gerrit-trigger'
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'releng-xci'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'bifrost/**'
-          readable-message: true
-
 # --------------------------
 # builder macros
 # --------------------------
-- 
cgit 1.2.3-korg