From: Morgan Richomme <morgan.richomme@orange.com>
Date: Tue, 17 Oct 2017 14:29:03 +0000 (+0000)
Subject: Merge "[Functest] Cleanup daily Jenkins job"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b040e3b644262b544d24a74f5787f6cb4e0476c8;hp=2fa156fcf1a730e8e839ded5ebdd09dd0d31b94c;p=releng.git

Merge "[Functest] Cleanup daily Jenkins job"
---

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index bddb2777b..2fc70b916 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -190,16 +190,6 @@
     #       <<: *master
     # -------------------------------
 
-    alpine-pod:
-      - ericsson-virtual-pod1bl01:
-          slave-label: '{alpine-pod}'
-          installer: fuel
-          <<: *master
-      - huawei-virtual5:
-          slave-label: '{alpine-pod}'
-          installer: compass
-          <<: *master
-
     testsuite:
       - 'suite':
           job-timeout: 60
@@ -210,7 +200,6 @@
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'
-      - 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
 
 ################################
 # job template
@@ -263,45 +252,6 @@
           description: "Built on $NODE_NAME"
       - 'functest-{testsuite}-builder'
 
-- job-template:
-    name: 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-per-node: 1
-          option: 'project'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
-      - timeout:
-          timeout: '{job-timeout}'
-          abort: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults'
-      - 'functest-{testsuite}-parameter'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-noha'
-      - functest-parameter:
-          gs-pathname: '{gs-pathname}'
-
-    scm:
-      - git-scm
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - 'functest-alpine-daily-builder'
 
 ########################
 # parameter macros
@@ -418,7 +368,6 @@
     name: functest-arm-daily-builder
     builders:
       - 'functest-cleanup'
-      - 'set-functest-env'
       - 'functest-arm-daily'
       - 'functest-store-results'
       - 'functest-exit'
@@ -427,16 +376,6 @@
     name: functest-suite-builder
     builders:
       - 'functest-cleanup'
-      - 'set-functest-env-alpine'
-      - 'functest-suite'
-      - 'functest-store-results'
-      - 'functest-exit'
-
-- builder:
-    name: functest-alpine-daily-builder
-    builders:
-      - 'functest-cleanup'
-      - 'set-functest-env-alpine'
       - 'functest-daily'
       - 'functest-store-results'
       - 'functest-exit'
@@ -454,21 +393,6 @@
 # yamllint enable rule:indentation
 - builder:
     name: functest-arm-daily
-    builders:
-      - shell:
-          !include-raw: ./functest-loop.sh
-
-- builder:
-    name: functest-suite
-    builders:
-      # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-alpine.sh
-
-# yamllint enable rule:indentation
-- builder:
-    name: set-functest-env
     builders:
       # yamllint disable rule:indentation
       - shell:
@@ -476,16 +400,7 @@
               - ./functest-env-presetup.sh
               - ../../utils/fetch_os_creds.sh
               - ./set-functest-env.sh
-
-# yamllint enable rule:indentation
-- builder:
-    name: set-functest-env-alpine
-    builders:
-      # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-env-presetup.sh
-              - ../../utils/fetch_os_creds.sh
+              - ./functest-loop.sh
 
 # yamllint enable rule:indentation
 - builder: