From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 3 Aug 2020 09:41:46 +0000 (+0200)
Subject: Remove Daisy jobs
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bda98043962ee21d54d86c4317f88329781dc33d;p=releng.git

Remove Daisy jobs

Daisy dropped a few years ago.

Change-Id: Ibc9b9e8d55ac01204f145445037b4842bad9926c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yaml b/jjb/daisy4nfv/daisy-daily-jobs.yaml
deleted file mode 100644
index 4a7e6e908..000000000
--- a/jjb/daisy4nfv/daisy-daily-jobs.yaml
+++ /dev/null
@@ -1,423 +0,0 @@
----
-# jenkins job templates for Daisy
-# TODO
-# [ ] enable baremetal jobs after baremetal deployment finish
-# [ ] enable jobs in danuble
-# [ ] add more scenarios
-# [ ] integration with yardstick
-
-- project:
-
-    name: 'daisy'
-    project: '{name}'
-    installer: '{name}'
-
-    # -------------------------------
-    # BRANCH ANCHORS
-    # -------------------------------
-    master: &master
-      stream: master
-      branch: '{stream}'
-      disabled: true
-      gs-pathname: ''
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
-      disabled: true
-
-    # -------------------------------
-    # POD, INSTALLER, AND BRANCH MAPPING
-    # -------------------------------
-    pod:
-      # -------------------------------
-      #        CI PODs
-      # -------------------------------
-      - baremetal:
-          slave-label: daisy-baremetal
-          <<: *master
-      - virtual:
-          slave-label: daisy-virtual
-          <<: *master
-      - baremetal:
-          slave-label: daisy-baremetal
-          <<: *fraser
-      - virtual:
-          slave-label: daisy-virtual
-          <<: *fraser
-      # -------------------------------
-      #        None-CI PODs
-      # -------------------------------
-      - zte-pod3:
-          slave-label: zte-pod3
-          <<: *master
-      - zte-pod3:
-          slave-label: zte-pod3
-          <<: *fraser
-      - zte-pod9:
-          slave-label: zte-pod9
-          <<: *master
-      - zte-pod9:
-          slave-label: zte-pod9
-          <<: *fraser
-
-    # -------------------------------
-    #       scenarios
-    # -------------------------------
-    scenario:
-      # HA scenarios
-      - 'os-nosdn-nofeature-ha':
-          auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
-      # NOHA scenarios
-      - 'os-nosdn-nofeature-noha':
-          auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
-      # ODL_L3 scenarios
-      - 'os-odl-nofeature-ha':
-          auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
-      # ovs_dpdk scenarios
-      - 'os-nosdn-ovs_dpdk-noha':
-          auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
-
-    jobs:
-      - '{project}-{scenario}-{pod}-daily-{stream}'
-      - '{project}-deploy-{pod}-daily-{stream}'
-
-########################
-# job templates
-########################
-- job-template:
-    name: '{project}-{scenario}-{pod}-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'daisy-os-.*?-{pod}-daily-.*?'
-            - 'daisy-daily-.*'
-            - 'daisy-kolla-build-.*'
-          blocking-level: 'NODE'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    triggers:
-      - '{auto-trigger-name}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults':
-          installer: '{installer}'
-      - 'testapi-parameter'
-      - 'daisy-project-parameter':
-          gs-pathname: '{gs-pathname}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
-
-    builders:
-      - description-setter:
-          description: "POD: $NODE_NAME"
-      - trigger-builds:
-          - project: 'daisy-deploy-{pod}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO={scenario}
-              INSTALLER_VERSION={stream}
-              UPSTREAM_JOB_NAME=$JOB_NAME
-              UPSTREAM_BUILD_ID=$BUILD_ID
-            same-node: true
-            block: true
-      - trigger-builds:
-          - project: 'functest-daisy-{pod}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO={scenario}
-              INSTALLER_VERSION={stream}
-              UPSTREAM_JOB_NAME=$JOB_NAME
-              UPSTREAM_BUILD_ID=$BUILD_ID
-            same-node: true
-            block: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
-      - trigger-builds:
-          - project: 'yardstick-daisy-{pod}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO={scenario}
-              INSTALLER_VERSION={stream}
-              UPSTREAM_JOB_NAME=$JOB_NAME
-              UPSTREAM_BUILD_ID=$BUILD_ID
-            block: true
-            same-node: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
-
-- job-template:
-    name: '{project}-deploy-{pod}-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'daisy-kolla-build-.*'
-            - '{installer}-(build|deploy|test)-daily-(fraser|master)'
-            - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
-            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
-          blocking-level: 'NODE'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults':
-          installer: '{installer}'
-      - 'testapi-parameter'
-      - 'daisy-project-parameter':
-          gs-pathname: '{gs-pathname}'
-      - 'deploy-scenario'
-      - string:
-          name: DEPLOY_TIMEOUT
-          default: '150'
-          description: 'Deployment timeout in minutes'
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    builders:
-      - description-setter:
-          description: "POD: $NODE_NAME"
-      - 'track-begin-timestamp'
-      - shell:
-          !include-raw-escape: ./daisy4nfv-download-artifact.sh
-      - shell:
-          !include-raw-escape: ./daisy-deploy.sh
-    publishers:
-      - 'report-provision-result'
-
-########################
-# trigger macros
-########################
-# ----------------------------------------------
-# Triggers for job running on daisy-baremetal against master branch
-# ----------------------------------------------
-# Basic HA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-# Basic NOHA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-# ODL Scenarios
-- trigger:
-    name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-# ovs_dpdk Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-
-# ----------------------------------------------
-# Triggers for job running on daisy-virtual against master branch
-# ----------------------------------------------
-# Basic HA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
-    triggers:
-      - timed: '0 16 * * *'
-# Basic NOHA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''
-# ODL Scenarios
-- trigger:
-    name: 'daisy-os-odl-nofeature-ha-virtual-daily-master-trigger'
-    triggers:
-      - timed: '0 12 * * *'
-# ovs_dpdk Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''
-
-# ----------------------------------------------
-# Triggers for job running on daisy-baremetal against fraser branch
-# ----------------------------------------------
-# Basic HA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: '0 0,6 * * *'
-# Basic NOHA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-# ODL Scenarios
-- trigger:
-    name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: '0 12,18 * * *'
-# ovs_dpdk Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-
-# ----------------------------------------------
-# Triggers for job running on daisy-virtual against fraser branch
-# ----------------------------------------------
-# Basic HA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: '0 0 * * *'
-# Basic NOHA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-# ODL Scenarios
-- trigger:
-    name: 'daisy-os-odl-nofeature-ha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: '0 20 * * *'
-# ovs_dpdk Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-
-# ----------------------------------------------
-# Triggers for job running on zte-pod3 against master branch
-# ----------------------------------------------
-# Basic HA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
-    triggers:
-      - timed: ''
-# Basic NOHA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger'
-    triggers:
-      - timed: ''
-# ODL Scenarios
-- trigger:
-    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-master-trigger'
-    triggers:
-      - timed: ''
-# ovs_dpdk Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-master-trigger'
-    triggers:
-      - timed: ''
-
-# ----------------------------------------------
-# Triggers for job running on zte-pod3 against fraser branch
-# ----------------------------------------------
-# Basic HA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-# Basic NOHA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-# ODL Scenarios
-- trigger:
-    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-fraser-trigger'
-    triggers:
-      - timed: '0 16,22 * * *'
-# ovs_dpdk Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-
-# ----------------------------------------------
-# ZTE POD9 Triggers running against master branch
-# ----------------------------------------------
-# ovs_dpdk Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger'
-    triggers:
-      - timed: '0 20 * * *'
-# Basic HA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger'
-    triggers:
-      - timed: ''
-# Basic NOHA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-zte-pod9-daily-master-trigger'
-    triggers:
-      - timed: ''
-# ODL Scenarios
-- trigger:
-    name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-master-trigger'
-    triggers:
-      - timed: ''
-
-# ----------------------------------------------
-# ZTE POD9 Triggers running against fraser branch
-# ----------------------------------------------
-# ovs_dpdk Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-fraser-trigger'
-    triggers:
-      - timed: '0 10 * * *'
-# Basic HA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-# Basic NOHA Scenarios
-- trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-zte-pod9-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-# ODL Scenarios
-- trigger:
-    name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-fraser-trigger'
-    triggers:
-      - timed: ''
diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
deleted file mode 100755
index 950b9be1f..000000000
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-set -o nounset
-set -o pipefail
-
-echo "--------------------------------------------------------"
-echo "This is $INSTALLER_TYPE deploy job!"
-echo "--------------------------------------------------------"
-
-DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature-noha"}
-BRIDGE=${BRIDGE:-pxebr}
-LAB_NAME=${NODE_NAME/-*}
-POD_NAME=${NODE_NAME/*-}
-deploy_ret=0
-
-if [[ ! "$NODE_NAME" =~ "-virtual" ]] && [[ ! "$LAB_NAME" =~ (zte) ]]; then
-    echo "Unsupported lab $LAB_NAME for now, Cannot continue!"
-    exit $deploy_ret
-fi
-
-# clone the securedlab/pharos repo
-cd $WORKSPACE
-
-# There are no PDFs in euphrates branch of pharos repo.
-if [[  "$BRANCH" =~ "euphrates" ]]; then
-    CONFIG_REPO_NAME=securedlab
-else
-    CONFIG_REPO_NAME=pharos
-fi
-
-if [[  "$BRANCH" =~ "master" ]]; then
-    DOCTOR_OPT="-d 1"
-else
-    DOCTOR_OPT=""
-fi
-
-LABS_DIR=/var/tmp/opnfv-${CONFIG_REPO_NAME}
-
-echo "Cloning ${CONFIG_REPO_NAME} repo $BRANCH to $LABS_DIR"
-sudo rm -rf $LABS_DIR
-git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/${CONFIG_REPO_NAME} \
-    --quiet --branch $BRANCH $LABS_DIR
-
-DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $LABS_DIR \
-                -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO \
-                $DOCTOR_OPT"
-
-# log info to console
-echo """
-Deployment parameters
---------------------------------------------------------
-Scenario: $DEPLOY_SCENARIO
-LAB: $LAB_NAME
-POD: $POD_NAME
-BRIDGE: $BRIDGE
-
-Starting the deployment using $INSTALLER_TYPE. This could take some time...
---------------------------------------------------------
-Issuing command
-$DEPLOY_COMMAND
-"""
-
-# start the deployment
-$DEPLOY_COMMAND
-
-if [ $? -ne 0 ]; then
-    echo
-    echo "Depolyment failed!"
-    deploy_ret=1
-else
-    echo
-    echo "--------------------------------------------------------"
-    echo "Deployment done!"
-fi
-
-exit $deploy_ret
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yaml b/jjb/daisy4nfv/daisy-project-jobs.yaml
deleted file mode 100644
index 791454820..000000000
--- a/jjb/daisy4nfv/daisy-project-jobs.yaml
+++ /dev/null
@@ -1,312 +0,0 @@
----
-######################################################################
-# Add daily jobs, for buidoing, deploying and testing
-# TODO:
-# - [ ] Add yardstick and functest for test stage
-# - [x] Use daisy-baremetal-defauls for choosing baremetal deployment
-######################################################################
-
-#############################
-# Job configuration for daisy
-#############################
-- project:
-    name: daisy-project-jobs
-
-    project: 'daisy'
-
-    installer: 'daisy'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: true
-      - fraser:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: true
-
-    phase:
-      - 'build':
-          slave-label: 'opnfv-build-centos'
-      - 'deploy':
-          slave-label: 'daisy-baremetal'
-      - 'test':
-          slave-label: 'opnfv-build-centos'
-
-    jobs:
-      - '{installer}-daily-{stream}'
-      - '{installer}-{phase}-daily-{stream}'
-      - '{installer}-kolla-build-{stream}'
-
-#############################
-# docker build job templates
-#############################
-- job-template:
-    name: '{installer}-kolla-build-{stream}'
-    disabled: false
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          # Note: Need to block all jobs which may create daisy VM.
-          blocking-jobs:
-            - '{installer}-kolla-build-.*'
-            - 'daisy-deploy-.*'
-            - 'daisy-daily-.*'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm
-
-    triggers:
-      - 'daisy-kolla-build-{stream}-trigger'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'daisy-virtual-defaults'
-      - '{installer}-defaults'
-      - '{installer}-project-parameter':
-          gs-pathname: '{gs-pathname}'
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 720
-          fail: true
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - shell:
-          !include-raw-escape: ./daisy4nfv-build-kolla-image.sh
-
-    publishers:
-      - '{installer}-recipients'
-      - email-jenkins-admins-on-failure
-
-- trigger:
-    name: 'daisy-kolla-build-fraser-trigger'
-    triggers:
-      - timed: '0 0 * * 0'
-
-- trigger:
-    name: 'daisy-kolla-build-master-trigger'
-    triggers:
-      - timed: '0 12 * * 0'
-
-
-########################
-# job templates
-########################
-- job-template:
-    name: '{installer}-daily-{stream}'
-
-    project-type: multijob
-
-    disabled: false
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '{installer}-daily-.*'
-            - '{installer}-kolla-build-.*'
-            - 'daisy4nfv-merge-build-.*'
-            - 'daisy4nfv-verify-build-.*'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: '0 8 * * *'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-centos-defaults'
-      - '{installer}-defaults'
-      - '{installer}-project-parameter':
-          gs-pathname: '{gs-pathname}'
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: build
-          condition: SUCCESSFUL
-          projects:
-            - name: '{installer}-build-daily-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: deploy
-          condition: SUCCESSFUL
-          projects:
-            - name: '{installer}-deploy-daily-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: test
-          condition: SUCCESSFUL
-          projects:
-            - name: '{installer}-test-daily-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-
-    publishers:
-      - '{installer}-recipients'
-      - email-jenkins-admins-on-failure
-
-- job-template:
-    name: '{installer}-{phase}-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 6
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '{installer}-daily-(build|deploy|test)-(fraser|master)'
-            - '{installer}-.*-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
-            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
-      - '{installer}-project-parameter':
-          gs-pathname: '{gs-pathname}'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{installer}-{phase}-daily-macro'
-
-#####################################
-# builder macros
-#####################################
-- builder:
-    name: 'daisy-build-daily-macro'
-    builders:
-      - shell:
-          !include-raw: ./daisy4nfv-basic.sh
-      - shell:
-          !include-raw: ./daisy4nfv-build.sh
-      - shell:
-          !include-raw: ./daisy4nfv-upload-artifact.sh
-      - 'clean-workspace'
-
-- builder:
-    name: 'daisy-deploy-daily-macro'
-    builders:
-      - shell:
-          !include-raw: ./daisy4nfv-download-artifact.sh
-      - shell:
-          !include-raw: ./daisy-deploy.sh
-
-- builder:
-    name: 'daisy-test-daily-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "Not activated!"
-
-#####################################
-# parameter macros
-#####################################
-- publisher:
-    name: 'daisy-recipients'
-    publishers:
-      # yamllint disable rule:line-length
-      - email:
-          recipients: hu.zhijiang@zte.com.cn lu.yao135@zte.com.cn zhou.ya@zte.com.cn yangyang1@zte.com.cn julienjut@gmail.com
-      # yamllint enable rule:line-length
-      - email-jenkins-admins-on-failure
-
-- parameter:
-    name: 'daisy-project-parameter'
-    parameters:
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-      - string:
-          name: CACHE_DIRECTORY
-          default: $HOME/opnfv/cache/$INSTALLER_TYPE
-          description: "Directory where the cache to be used during the build is located."
-      - string:
-          name: GS_URL
-          default: artifacts.opnfv.org/$PROJECT{gs-pathname}
-          description: "URL to Google Storage."
diff --git a/jjb/daisy4nfv/daisy-rtd-jobs.yaml b/jjb/daisy4nfv/daisy-rtd-jobs.yaml
deleted file mode 100644
index 2e7689a68..000000000
--- a/jjb/daisy4nfv/daisy-rtd-jobs.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- project:
-    name: daisy-rtd
-    project: daisy
-    project-name: daisy
-
-    project-pattern: 'daisy'
-    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-daisy/47361/'
-    rtd-token: '265efe14ff0bb3fa0d4ea66d6be1b7b511d5d713'
-
-    jobs:
-      - '{project-name}-rtd-jobs'
diff --git a/jjb/daisy4nfv/daisy4nfv-basic.sh b/jjb/daisy4nfv/daisy4nfv-basic.sh
deleted file mode 100755
index 87f5482e0..000000000
--- a/jjb/daisy4nfv/daisy4nfv-basic.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo "--------------------------------------------------------"
-echo "This is diasy4nfv basic job!"
-echo "--------------------------------------------------------"
-
diff --git a/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh b/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh
deleted file mode 100755
index 0441ea159..000000000
--- a/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 ZTE Coreporation and others.
-# hu.zhijiang@zte.com.cn
-# sun.jing22@zte.com.cn
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-upload_image_to_opnfv () {
-    image=$1
-
-    sha512sum -b $image > $image.sha512sum
-    gsutil cp $image.sha512sum gs://$GS_URL/upstream/$image.sha512sum
-
-    echo "Uploading $INSTALLER_TYPE artifact. This could take some time..."
-    echo
-    gsutil cp $image gs://$GS_URL/upstream/$image
-    gsutil -m setmeta \
-        -h "Cache-Control:private, max-age=0, no-transform" \
-        gs://$GS_URL/upstream/$image
-
-    # check if we uploaded the file successfully to see if things are fine
-    gsutil ls gs://$GS_URL/upstream/$image
-    if [[ $? -ne 0 ]]; then
-        echo "Problem while uploading artifact!"
-        exit 1
-    fi
-}
-
-
-
-echo "--------------------------------------------------------"
-echo "This is diasy4nfv kolla image build job!"
-echo "--------------------------------------------------------"
-
-# start the build
-cd $WORKSPACE
-rm -rf docker_build_dir
-mkdir -p docker_build_dir
-
-# -j is for deciding which branch will be used when building,
-# only for OPNFV
-sudo -E ./ci/kolla-build.sh -j $JOB_NAME -w $WORKSPACE/docker_build_dir
-
-if [ $? -ne 0 ]; then
-    echo
-    echo "Kolla build failed!"
-    deploy_ret=1
-else
-    echo
-    echo "--------------------------------------------------------"
-    echo "Kolla build done!"
-fi
-
-image=$(ls $WORKSPACE/docker_build_dir/kolla-build-output/kolla-image-*.tgz)
-upload_image_to_opnfv $image
-
-echo
-echo "--------------------------------------------------------"
-echo "All done!"
diff --git a/jjb/daisy4nfv/daisy4nfv-build.sh b/jjb/daisy4nfv/daisy4nfv-build.sh
deleted file mode 100755
index a081b3bc6..000000000
--- a/jjb/daisy4nfv/daisy4nfv-build.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-echo "--------------------------------------------------------"
-echo "This is diasy4nfv build job!"
-echo "--------------------------------------------------------"
-
-# set OPNFV_ARTIFACT_VERSION
-if [[ "$JOB_NAME" =~ "merge" ]]; then
-    echo "Building Daisy4nfv ISO for a merged change"
-    export OPNFV_ARTIFACT_VERSION="gerrit-$GERRIT_CHANGE_NUMBER"
-else
-    export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S")
-fi
-
-# build output directory
-OUTPUT_DIR=$WORKSPACE/build_output
-mkdir -p $OUTPUT_DIR
-
-# start the build
-cd $WORKSPACE
-./ci/build.sh $OUTPUT_DIR $OPNFV_ARTIFACT_VERSION
-
-# save information regarding artifact into file
-(
-    echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
-    echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
-    echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
-    echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin"
-    echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $OUTPUT_DIR/opnfv-$OPNFV_ARTIFACT_VERSION.bin | cut -d' ' -f1)"
-    echo "OPNFV_ARTIFACT_URL_ISO=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
-    echo "OPNFV_ARTIFACT_SHA512SUM_ISO=$(sha512sum $OUTPUT_DIR/opnfv-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
-    echo "OPNFV_BUILD_URL=$BUILD_URL"
-) > $WORKSPACE/opnfv.properties
-
-echo
-echo "--------------------------------------------------------"
-echo "Done!"
diff --git a/jjb/daisy4nfv/daisy4nfv-download-artifact.sh b/jjb/daisy4nfv/daisy4nfv-download-artifact.sh
deleted file mode 100755
index ae5ca3813..000000000
--- a/jjb/daisy4nfv/daisy4nfv-download-artifact.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 ZTE Coreporation and others.
-# hu.zhijiang@zte.com.cn
-# sun.jing22@zte.com.cn
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o pipefail
-
-# use proxy url to replace the nomral URL, for googleusercontent.com will be blocked randomly
-[[ "$NODE_NAME" =~ (zte) ]] && GS_URL=${GS_BASE_PROXY%%/*}/$GS_URL
-
-if [[ "$JOB_NAME" =~ "merge" ]]; then
-    echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties"
-    # get the properties file for the Daisy4nfv BIN built for a merged change
-    curl -L -s -o $WORKSPACE/latest.properties http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties
-else
-    # get the latest.properties file in order to get info regarding latest artifact
-    echo "Downloading http://$GS_URL/latest.properties"
-    curl -L -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties
-fi
-
-# check if we got the file
-[[ -f $WORKSPACE/latest.properties ]] || exit 1
-
-# source the file so we get artifact metadata
-source $WORKSPACE/latest.properties
-
-# echo the info about artifact that is used during the deployment
-OPNFV_ARTIFACT=${OPNFV_ARTIFACT_URL/*\/}
-echo "Using $OPNFV_ARTIFACT for deployment"
-
-[[ "$NODE_NAME" =~ (zte) ]] && OPNFV_ARTIFACT_URL=${GS_BASE_PROXY%%/*}/$OPNFV_ARTIFACT_URL
-
-if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
-    # check if we already have the image to avoid redownload
-    BINSTORE="/bin_mount/opnfv_ci/${BRANCH##*/}"
-    if [[ -f "$BINSTORE/$OPNFV_ARTIFACT" && ! -z $OPNFV_ARTIFACT_SHA512SUM ]]; then
-        echo "BIN exists locally. Starting to check the sha512sum."
-        if [[ $OPNFV_ARTIFACT_SHA512SUM = $(sha512sum -b $BINSTORE/$OPNFV_ARTIFACT | cut -d' ' -f1) ]]; then
-            echo "Sha512sum is verified. Skipping the download and using the file from BIN store."
-            ln -s $BINSTORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.bin
-            echo "--------------------------------------------------------"
-            echo
-            ls -al $WORKSPACE/opnfv.bin
-            echo
-            echo "--------------------------------------------------------"
-            echo "Done!"
-            exit 0
-        fi
-    fi
-fi
-
-# log info to console
-echo "Downloading the $INSTALLER_TYPE artifact using URL http://$OPNFV_ARTIFACT_URL"
-echo "This could take some time... Now the time is $(date -u)"
-echo "--------------------------------------------------------"
-echo
-
-# download the file
-if [[ "$NODE_NAME" =~ (zte) ]] && [ -x "$(command -v aria2c)" ]; then
-    DOWNLOAD_CMD="aria2c -x 3 --allow-overwrite=true -d $WORKSPACE -o opnfv.bin"
-else
-    DOWNLOAD_CMD="curl -L -s -o $WORKSPACE/opnfv.bin"
-fi
-
-maxretries=3
-cnt=0
-rc=1
-while [ $cnt -lt $maxretries ] && [ $rc -ne 0 ]
-do
-    cnt=$[cnt + 1]
-    $DOWNLOAD_CMD http://$OPNFV_ARTIFACT_URL > gsutil.bin.log 2>&1
-    rc=$?
-done
-
-# list the file
-ls -al $WORKSPACE/opnfv.bin
-
-echo
-echo "--------------------------------------------------------"
-echo "Done!"
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
deleted file mode 100644
index c261c23bc..000000000
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
----
-- project:
-    name: 'daisy4nfv-merge-jobs'
-
-    project: 'daisy'
-
-    installer: 'daisy'
-
-    ###########################################################
-    # use alias to keep the jobs'name existed already unchanged
-    ###########################################################
-    alias: 'daisy4nfv'
-
-    #####################################
-    # branch definitions
-    #####################################
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: true
-      - fraser:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: true
-    #####################################
-    # patch merge phases
-    #####################################
-    phase:
-      - 'build':
-          slave-label: 'opnfv-build-centos'
-      - 'deploy-virtual':
-          slave-label: 'daisy-virtual'
-
-    #####################################
-    # jobs
-    #####################################
-    jobs:
-      - '{alias}-merge-{stream}'
-      - '{alias}-merge-{phase}-{stream}'
-
-#####################################
-# job templates
-#####################################
-- job-template:
-    name: '{alias}-merge-{stream}'
-
-    project-type: multijob
-
-    disabled: false
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '{alias}-merge-(master|fraser)'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'ci/**'
-                - compare-type: ANT
-                  pattern: 'code/**'
-                - compare-type: ANT
-                  pattern: 'deploy/**'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**'
-                - compare-type: ANT
-                  pattern: '.gitignore'
-          readable-message: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-centos-defaults'
-      - '{alias}-merge-defaults':
-          gs-pathname: '{gs-pathname}'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: build
-          condition: SUCCESSFUL
-          projects:
-            - name: '{alias}-merge-build-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: deploy-virtual
-          condition: SUCCESSFUL
-          projects:
-            - name: '{alias}-merge-deploy-virtual-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-
-- job-template:
-    name: '{alias}-merge-{phase}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '{alias}-merge-{phase}-.*'
-            - '{installer}-daily-.*'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults'
-      - '{alias}-merge-defaults':
-          gs-pathname: '{gs-pathname}'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{project}-merge-{phase}-macro'
-
-#####################################
-# builder macros
-#####################################
-- builder:
-    name: 'daisy-merge-build-macro'
-    builders:
-      - shell:
-          !include-raw: ./daisy4nfv-basic.sh
-      - shell:
-          !include-raw: ./daisy4nfv-build.sh
-      - shell:
-          !include-raw: ./daisy4nfv-upload-artifact.sh
-      - 'clean-workspace'
-
-- builder:
-    name: 'daisy-merge-deploy-virtual-macro'
-    builders:
-      - shell:
-          !include-raw: ./daisy4nfv-download-artifact.sh
-      - shell:
-          !include-raw: ./daisy-deploy.sh
-      - 'clean-workspace'
-
-#####################################
-# parameter macros
-#####################################
-- parameter:
-    name: 'daisy4nfv-merge-defaults'
-    parameters:
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-      - string:
-          name: CACHE_DIRECTORY
-          default: $HOME/opnfv/cache/$INSTALLER_TYPE
-          description: "Directory where the cache to be used during the build is located."
-      - string:
-          name: GS_URL
-          default: artifacts.opnfv.org/$PROJECT{gs-pathname}
-          description: "URL to Google Storage."
diff --git a/jjb/daisy4nfv/daisy4nfv-smoke-test.sh b/jjb/daisy4nfv/daisy4nfv-smoke-test.sh
deleted file mode 100755
index bd6eb7ee0..000000000
--- a/jjb/daisy4nfv/daisy4nfv-smoke-test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-echo "--------------------------------------------------------"
-echo "This is diasy4nfv smoke test job!"
-echo "--------------------------------------------------------"
-
diff --git a/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh b/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh
deleted file mode 100755
index def4f6a75..000000000
--- a/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2016 ZTE Coreporation and others.
-# hu.zhijiang@zte.com.cn
-# sun.jing22@zte.com.cn
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o pipefail
-
-# check if we built something
-if [ -f $WORKSPACE/.noupload ]; then
-    echo "Nothing new to upload. Exiting."
-    /bin/rm -f $WORKSPACE/.noupload
-    exit 0
-fi
-
-# source the opnfv.properties to get ARTIFACT_VERSION
-source $WORKSPACE/opnfv.properties
-
-importkey () {
-# clone releng repository
-echo "Cloning releng repository..."
-[ -d releng ] && rm -rf releng
-git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng/ &> /dev/null
-#this is where we import the siging key
-if [ -f $WORKSPACE/releng/utils/gpg_import_key.sh ]; then
-  source $WORKSPACE/releng/utils/gpg_import_key.sh
-fi
-}
-
-signbin () {
-gpg2 -vvv --batch --yes --no-tty \
-  --default-key opnfv-helpdesk@rt.linuxfoundation.org  \
-  --passphrase besteffort \
-  --detach-sig $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.bin
-
-gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.bin.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin.sig
-echo "BIN signature Upload Complete!"
-}
-
-uploadbin () {
-# log info to console
-echo "Uploading $INSTALLER_TYPE artifact. This could take some time..."
-echo
-
-cd $WORKSPACE
-# upload artifact and additional files to google storage
-gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.bin \
-    gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin > gsutil.bin.log 2>&1
-gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso \
-    gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso >> gsutil.bin.log 2>&1
-gsutil cp $WORKSPACE/opnfv.properties \
-    gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1
-if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
-    gsutil cp $WORKSPACE/opnfv.properties \
-    gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1
-elif [[ "$JOB_NAME" =~ "merge" ]]; then
-    echo "Uploaded Daisy4nfv artifacts for a merged change"
-fi
-
-gsutil -m setmeta \
-    -h "Content-Type:text/html" \
-    -h "Cache-Control:private, max-age=0, no-transform" \
-    gs://$GS_URL/latest.properties \
-    gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > /dev/null 2>&1
-
-gsutil -m setmeta \
-    -h "Cache-Control:private, max-age=0, no-transform" \
-    gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin > /dev/null 2>&1
-
-# disabled errexit due to gsutil setmeta complaints
-#   BadRequestException: 400 Invalid argument
-# check if we uploaded the file successfully to see if things are fine
-gsutil ls gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin > /dev/null 2>&1
-if [[ $? -ne 0 ]]; then
-    echo "Problem while uploading artifact!"
-    echo "Check log $WORKSPACE/gsutil.bin.log on the machine where this build is done."
-    exit 1
-fi
-
-echo "Done!"
-echo
-echo "--------------------------------------------------------"
-echo
-echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin"
-echo
-echo "--------------------------------------------------------"
-echo
-}
-
-importkey
-signbin
-uploadbin
diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml
deleted file mode 100644
index c8c1db096..000000000
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml
+++ /dev/null
@@ -1,225 +0,0 @@
----
-- project:
-    name: 'daisy4nfv-verify-jobs'
-    project: 'daisy'
-    installer: 'daisy'
-    ##########################################################
-    # use alias to keep the jobs'name existed alread unchanged
-    ##########################################################
-    alias: 'daisy4nfv'
-
-    #####################################
-    # branch definitions
-    #####################################
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: true
-      - fraser:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: true
-
-    #####################################
-    # patch verification phases
-    #####################################
-    phase:
-      - unit:
-          slave-label: 'opnfv-build'
-      - build:
-          slave-label: 'opnfv-build-centos'
-
-    #####################################
-    # jobs
-    #####################################
-    jobs:
-      - '{alias}-verify-{stream}'
-      - '{alias}-verify-{phase}-{stream}'
-
-#####################################
-# job templates
-#####################################
-- job-template:
-    name: '{alias}-verify-{stream}'
-    project-type: multijob
-    disabled: false
-    concurrent: true
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '{alias}-merge-build-.*'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm-gerrit
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    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'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'ci/**'
-                - compare-type: ANT
-                  pattern: 'code/**'
-                - compare-type: ANT
-                  pattern: 'deploy/**'
-                - compare-type: ANT
-                  pattern: 'tests/**'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**'
-                - compare-type: ANT
-                  pattern: '.gitignore'
-          readable-message: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-centos-defaults'
-      - '{alias}-verify-defaults':
-          gs-pathname: '{gs-pathname}'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: unit
-          condition: SUCCESSFUL
-          projects:
-            - name: '{alias}-verify-unit-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: build
-          condition: SUCCESSFUL
-          projects:
-            - name: '{alias}-verify-build-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-
-- job-template:
-    name: '{alias}-verify-{phase}-{stream}'
-    disabled: '{obj:disabled}'
-    concurrent: true
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 6
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '{alias}-merge-build-.*'
-            - '{alias}-verify-build-.*'
-            - '{installer}-daily-.*'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm-gerrit
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults'
-      - '{alias}-verify-defaults':
-          gs-pathname: '{gs-pathname}'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{project}-verify-{phase}-macro'
-
-#####################################
-# builder macros
-#####################################
-- builder:
-    name: 'daisy-verify-build-macro'
-    builders:
-      - shell:
-          !include-raw: ./daisy4nfv-basic.sh
-      - shell:
-          !include-raw: ./daisy4nfv-build.sh
-      - 'clean-workspace'
-
-- builder:
-    name: daisy-verify-unit-macro
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -o errexit
-          set -o pipefail
-          set -o xtrace
-          tox -e py27
-
-#####################################
-# parameter macros
-#####################################
-- parameter:
-    name: 'daisy4nfv-verify-defaults'
-    parameters:
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build_output
-          description: "Directory where the build artifact will be located upon the completion of the build."
-      - string:
-          name: CACHE_DIRECTORY
-          default: $HOME/opnfv/cache/$INSTALLER_TYPE
-          description: "Directory where the cache to be used during the build is located."
-      - string:
-          name: GS_URL
-          default: artifacts.opnfv.org/$PROJECT{gs-pathname}
-          description: "URL to Google Storage."