X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-verify-jobs.yaml;h=0248907223ac2dfeea18b10acd228dd451cfbc86;hb=adcb86b47d623600a06a0ec13615dd1d15ae9984;hp=5695ef8a058c852e633a1fa21bd210dfb409b4b0;hpb=6a2f75928ca54b0566ac116ec608cd4a37c23227;p=releng.git diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index 5695ef8a0..024890722 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: iruya + - 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