X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-verify-jobs.yaml;h=a5efd2d166a47e68f2409a7065a420f62be7d8e4;hb=13b5c563594ab9fad446a4e5c6d6357dfb6fd82f;hp=5695ef8a058c852e633a1fa21bd210dfb409b4b0;hpb=871235891d792631dc0d2d4c2af89141fa5928e4;p=releng.git diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index 5695ef8a0..a5efd2d16 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -13,20 +13,20 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: + functest_docker_tag: hunter + - hunter: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false + functest_docker_tag: '{stream}' ##################################### # cluster architectures ##################################### + # Note: arm64 was removed since it was basically a no-op arch_tag: - 'amd64': slave-label: 'fuel' functest-suite-label: 'fuel' - - 'arm64': - slave-label: 'armband' - functest-suite-label: 'fuel-armband' ##################################### # cluster types ##################################### @@ -66,7 +66,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'fuel-os-.*?-daily-.*' + - 'fuel-(os|k8)-.*?-daily-.*' - 'fuel-verify-.*' blocking-level: 'NODE' @@ -146,6 +146,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + DOCKER_TAG={functest_docker_tag} node-parameters: true enable-condition: "def m = ! ('$NODE_LABELS' =~ /armband-virtual/)" kill-phase-on: NEVER