X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=a9a0da2ee5448339d935322f75856ccd75371c01;hb=bb2508b0f971de18385fc65b82c5ae0e32c83915;hp=6f4643ac8171e473937cd0c3bbaab9c1c5b074a7;hpb=ed07f0df576cd775acc9b14ef4356732a109d82b;p=releng.git diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index 6f4643ac8..a9a0da2ee 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -32,24 +32,24 @@ # CI PODs # ------------------------------- pod: - # - baremetal: - # slave-label: daisy-baremetal - # <<: *master - - virtual: - slave-label: daisy-virtual - <<: *master - baremetal: slave-label: daisy-baremetal - <<: *euphrates + <<: *master - virtual: slave-label: daisy-virtual - <<: *euphrates + <<: *master + # - baremetal: + # slave-label: daisy-baremetal + # <<: *euphrates + # - virtual: + # slave-label: daisy-virtual + # <<: *euphrates # ------------------------------- # None-CI PODs # ------------------------------- - - baremetal: - slave-label: zte-pod3 - <<: *master + # - baremetal: + # slave-label: zte-pod3 + # <<: *master - zte-pod9: slave-label: zte-pod9 <<: *master @@ -117,9 +117,7 @@ - '{installer}-defaults' - '{slave-label}-defaults': installer: '{installer}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' + - 'testapi-parameter' - 'daisy-project-parameter': gs-pathname: '{gs-pathname}' @@ -203,9 +201,7 @@ - '{installer}-defaults' - '{slave-label}-defaults': installer: '{installer}' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' + - 'testapi-parameter' - 'daisy-project-parameter': gs-pathname: '{gs-pathname}' - string: