diff options
Diffstat (limited to 'jjb/apex')
| -rwxr-xr-x | jjb/apex/apex-build.sh | 10 | ||||
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 13 | ||||
| -rwxr-xr-x | jjb/apex/apex-download-artifact.sh | 6 | ||||
| -rwxr-xr-x | jjb/apex/apex-iso-verify.sh | 4 | ||||
| -rw-r--r-- | jjb/apex/apex-project-jobs.yaml | 7 | ||||
| -rwxr-xr-x | jjb/apex/apex-upload-artifact.sh | 10 | ||||
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 9 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 305 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 124 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 31 |
10 files changed, 436 insertions, 83 deletions
diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh index 09aa716be..618d18110 100755 --- a/jjb/apex/apex-build.sh +++ b/jjb/apex/apex-build.sh @@ -12,7 +12,7 @@ echo if echo $ARTIFACT_VERSION | grep "dev" 1> /dev/null; then GERRIT_PATCHSET_NUMBER=$(echo $GERRIT_REFSPEC | grep -Eo '[0-9]+$') export OPNFV_ARTIFACT_VERSION="dev${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}" - if [ "$BRANCH" == 'master' ]; then + if [[ "$BRANCH" != 'stable/fraser' ]]; then # build rpm export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --rpms" else @@ -23,14 +23,14 @@ elif echo $BUILD_TAG | grep "csit" 1> /dev/null; then export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY" elif [ "$ARTIFACT_VERSION" == "daily" ]; then export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d") - if [ "$BRANCH" == 'master' ]; then + if [[ "$BRANCH" != 'stable/fraser' ]]; then export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --rpms" else export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso" fi else export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION} - if [ "$BRANCH" == 'master' ]; then + if [[ "$BRANCH" != 'stable/fraser' ]]; then export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --rpms" else export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso" @@ -59,7 +59,7 @@ echo "Cache Directory Contents:" echo "-------------------------" ls -al $CACHE_DIRECTORY -if [[ "$BUILD_ARGS" =~ '--iso' && "$BRANCH" != 'master' ]]; then +if [[ "$BUILD_ARGS" =~ '--iso' && "$BRANCH" == 'stable/fraser' ]]; then mkdir -p /tmp/apex-iso/ rm -f /tmp/apex-iso/*.iso cp -f $BUILD_DIRECTORY/../.build/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso /tmp/apex-iso/ @@ -67,7 +67,7 @@ fi if ! echo $ARTIFACT_VERSION | grep "dev" 1> /dev/null; then echo "Writing opnfv.properties file" - if [ "$BRANCH" != master ]; then + if [ "$BRANCH" == 'stable/fraser' ]; then # save information regarding artifact into file ( echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION" diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 441bf9059..4876b8504 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -29,7 +29,7 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then # we want to use that built in mechanism to avoid re-downloading every job # so we use a dedicated folder to hold the upstream cache UPSTREAM_CACHE=$HOME/upstream_cache - if [ "$BRANCH" == 'master' ]; then + if [[ "$BRANCH" != 'stable/fraser' ]]; then mkdir -p ${UPSTREAM_CACHE} RESOURCES=$UPSTREAM_CACHE else @@ -55,7 +55,7 @@ else # set to use different directory here because upon RPM removal this # directory will be wiped in daily UPSTREAM_CACHE=$HOME/upstream_cache - if [ "$BRANCH" == 'master' ]; then + if [[ "$BRANCH" != 'stable/fraser' ]]; then mkdir -p ${UPSTREAM_CACHE} RESOURCES=$UPSTREAM_CACHE else @@ -141,8 +141,8 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then fi if [[ "$PROMOTE" == "True" || "$CSIT_ENV_FLAG" == "True" ]]; then - if [[ "$DEPLOY_SCENARIO" =~ "queens" ]]; then - CSIT_ENV="csit-queens-environment.yaml" + if [[ "$OS_VERSION" != "master" ]]; then + CSIT_ENV="csit-${OS_VERSION}-environment.yaml" else CSIT_ENV="csit-environment.yaml" fi @@ -161,11 +161,6 @@ else DEPLOY_CMD="${DEPLOY_CMD} -i ${INVENTORY_FILE}" fi -if [[ "$BRANCH" == "master" ]]; then - echo "Upstream deployment detected" - DEPLOY_CMD="${DEPLOY_CMD} --upstream" -fi - if [ "$IPV6_FLAG" == "True" ]; then NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml" elif [[ "$PROMOTE" == "True" ]]; then diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh index e1e51b3b6..bc3311d68 100755 --- a/jjb/apex/apex-download-artifact.sh +++ b/jjb/apex/apex-download-artifact.sh @@ -18,8 +18,8 @@ else fi if [[ "$ARTIFACT_VERSION" =~ dev ]]; then - if [ "$BRANCH" == 'master' ]; then - echo "Skipping download of artifacts for master branch" + if [[ "$BRANCH" != 'stable/fraser' ]]; then + echo "Skipping download of artifacts for master/gambia branch" else # dev build GERRIT_PATCHSET_NUMBER=$(echo $GERRIT_REFSPEC | grep -Eo '[0-9]+$') @@ -47,7 +47,7 @@ else RPM_LIST=$(basename $OPNFV_RPM_URL) # find version of RPM VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-([0-9]{8}|[a-z]+-[0-9]\.[0-9]+)') - if [ "$BRANCH" != 'master' ]; then + if [ "$BRANCH" == 'stable/fraser' ]; then # build RPM List which already includes base Apex RPM RPM_LIST+=" opnfv-apex-undercloud-${VERSION_EXTENSION}.noarch.rpm" RPM_LIST+=" python34-opnfv-apex-${VERSION_EXTENSION}.noarch.rpm" diff --git a/jjb/apex/apex-iso-verify.sh b/jjb/apex/apex-iso-verify.sh index f34937619..c29d7cb32 100755 --- a/jjb/apex/apex-iso-verify.sh +++ b/jjb/apex/apex-iso-verify.sh @@ -8,8 +8,8 @@ echo "Starting the Apex iso verify." echo "--------------------------------------------------------" echo -if [ "$BRANCH" == 'master' ]; then - echo "Skipping Apex iso verify for master branch" +if [ "$BRANCH" != 'stable/fraser' ]; then + echo "Skipping Apex iso verify for ${BRANCH} branch" exit 0 fi diff --git a/jjb/apex/apex-project-jobs.yaml b/jjb/apex/apex-project-jobs.yaml index 700ff60e8..42567ea1b 100644 --- a/jjb/apex/apex-project-jobs.yaml +++ b/jjb/apex/apex-project-jobs.yaml @@ -9,6 +9,11 @@ gs-pathname: '' concurrent-builds: 3 disabled: false + - gambia: &gambia + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + concurrent-builds: 3 + disabled: false - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' @@ -68,7 +73,7 @@ option: 'project' - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify-iso-{stream}' diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh index 5c777a824..07198b188 100755 --- a/jjb/apex/apex-upload-artifact.sh +++ b/jjb/apex/apex-upload-artifact.sh @@ -114,8 +114,8 @@ fi if [ "$ARTIFACT_TYPE" == 'snapshot' ]; then uploadsnap elif [ "$ARTIFACT_TYPE" == 'iso' ]; then - if [[ "$ARTIFACT_VERSION" =~ dev || "$BRANCH" == 'master' ]]; then - echo "Skipping ISO artifact upload for ${ARTIFACT_TYPE} due to dev/master build" + if [[ "$ARTIFACT_VERSION" =~ dev || "$BRANCH" != 'stable/fraser' ]]; then + echo "Skipping ISO artifact upload for ${ARTIFACT_TYPE} due to dev/${BRANCH} build" exit 0 fi if [[ -n "$SIGN_ARTIFACT" && "$SIGN_ARTIFACT" == "true" ]]; then @@ -124,8 +124,8 @@ elif [ "$ARTIFACT_TYPE" == 'iso' ]; then uploadiso elif [ "$ARTIFACT_TYPE" == 'rpm' ]; then if [[ "$ARTIFACT_VERSION" =~ dev ]]; then - if [ "$BRANCH" == 'master' ]; then - echo "will not upload artifacts, master uses upstream" + if [[ "$BRANCH" != 'stable/fraser' ]]; then + echo "will not upload artifacts, ${BRANCH} uses upstream" ARTIFACT_TYPE=none else echo "dev build detected, will upload image tarball" @@ -138,7 +138,7 @@ elif [ "$ARTIFACT_TYPE" == 'rpm' ]; then RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL) SRPM_INSTALL_PATH=$BUILD_DIRECTORY SRPM_LIST=$SRPM_INSTALL_PATH/$(basename $OPNFV_SRPM_URL) - if [ "$BRANCH" != 'master' ]; then + if [[ "$BRANCH" == 'stable/fraser' ]]; then VERSION_EXTENSION=$(echo $(basename $OPNFV_RPM_URL) | sed 's/opnfv-apex-//') RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-undercloud-${VERSION_EXTENSION}" RPM_LIST+=" ${RPM_INSTALL_PATH}/python34-opnfv-apex-${VERSION_EXTENSION}" diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index f0f99fc78..854aefc7f 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -12,6 +12,11 @@ gs-pathname: '' verify-scenario: 'os-nosdn-nofeature-noha' disabled: false + - gambia: &gambia + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + verify-scenario: 'os-nosdn-nofeature-ha' + disabled: false - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' @@ -196,7 +201,7 @@ option: 'project' - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-.*-promote.*' builders: @@ -311,7 +316,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-virtual.*' diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index fd0e8269c..5a8f241b1 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -30,6 +30,16 @@ scenario_stream: 'master' disable_daily: false disable_promote: false + - gambia: &gambia + branch: 'stable/gambia' + gs-pathname: '/gambia' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-nosdn-nofeature-ha' + scenario_stream: 'gambia' + disable_daily: false + disable_promote: false - fraser: &fraser branch: 'stable/fraser' gs-pathname: '/fraser' @@ -68,6 +78,30 @@ - 'os-odl-bgpvpn-ha': <<: *fraser - 'os-nosdn-nofeature-noha': + <<: *gambia + - 'os-nosdn-nofeature-ha': + <<: *gambia + - 'os-nosdn-nofeature-ha-ipv6': + <<: *gambia + - 'os-odl-nofeature-noha': + <<: *gambia + - 'os-odl-nofeature-ha': + <<: *gambia + - 'k8s-nosdn-nofeature-noha': + <<: *gambia + - 'os-odl-bgpvpn-ha': + <<: *gambia + - 'os-odl-bgpvpn-noha': + <<: *gambia + - 'os-odl-sfc-ha': + <<: *gambia + - 'os-odl-sfc-noha': + <<: *gambia + - 'os-nosdn-calipso-noha': + <<: *gambia + - 'os-ovn-nofeature-ha': + <<: *gambia + - 'os-nosdn-nofeature-noha': <<: *danube - 'os-nosdn-nofeature-ha': <<: *danube @@ -129,15 +163,15 @@ <<: *master - 'os-odl-nofeature-ha': <<: *master - - 'os-nosdn-queens-noha': + - 'os-nosdn-rocky-noha': <<: *master - - 'os-nosdn-queens-ha': + - 'os-nosdn-rocky-ha': <<: *master - - 'os-nosdn-queens-ha-ipv6': + - 'os-nosdn-rocky-ha-ipv6': <<: *master - - 'os-odl-queens-noha': + - 'os-odl-rocky-noha': <<: *master - - 'os-odl-queens-ha': + - 'os-odl-rocky-ha': <<: *master - 'k8s-nosdn-nofeature-noha': <<: *master @@ -153,13 +187,17 @@ <<: *master - 'os-odl-sfc-noha': <<: *master - - 'os-odl-sfc_queens-ha': + - 'os-odl-sfc_rocky-ha': <<: *master - - 'os-odl-sfc_queens-noha': + - 'os-odl-sfc_rocky-noha': <<: *master - 'os-nosdn-calipso-noha': <<: *master - - 'os-nosdn-calipso_queens-noha': + - 'os-nosdn-calipso_rocky-noha': + <<: *master + - 'os-ovn-nofeature-ha': + <<: *master + - 'os-ovn-rocky-ha': <<: *master - 'os-nosdn-nofeature-noha': <<: *euphrates @@ -201,15 +239,15 @@ - 'virtual' os_version: - - 'pike': - os_scenario: 'pike' - odl_branch: 'stable/carbon' - 'queens': - os_scenario: 'queens' + os_scenario: 'nofeature' + odl_branch: 'stable/oxygen' + - 'rocky': + os_scenario: 'rocky' odl_branch: 'stable/oxygen' - 'master': os_scenario: 'nofeature' - odl_branch: 'stable/oxygen' + odl_branch: 'stable/fluorine' topology: - 'noha' @@ -269,7 +307,7 @@ - logrotate-default - build-blocker: use-build-blocker: false - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-deploy.*' - throttle: @@ -346,7 +384,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-deploy.*' - 'functest.*' @@ -402,13 +440,14 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-runner.*' - 'apex-run.*' - 'apex-virtual-.*' - 'apex-verify-gate-.*' - 'odl-netvirt.*' + - 'apex-.*-promote.*' - throttle: max-per-node: 1 max-total: 10 @@ -506,7 +545,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -618,7 +657,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -733,7 +772,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-daily.*' @@ -860,7 +899,7 @@ properties: - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -873,7 +912,7 @@ option: 'project' triggers: - - timed: '0 12 * * 0' + - '{stream}-{os_version}' builders: - multijob: @@ -988,7 +1027,7 @@ properties: - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-deploy.*' @@ -1094,7 +1133,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -1163,7 +1202,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -1274,6 +1313,111 @@ abort-all-job: true git-revision: false +# gambia Builder +- builder: + name: apex-builder-gambia + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-nofeature-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-nofeature-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-bgpvpn-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-bgpvpn-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-sfc-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-sfc-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-calipso-noha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-ovn-nofeature-ha-baremetal-gambia' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + # danube Builder - builder: name: apex-builder-danube @@ -1539,7 +1683,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-queens-noha-baremetal-master' + - name: 'apex-os-nosdn-rocky-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1547,7 +1691,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-queens-ha-baremetal-master' + - name: 'apex-os-nosdn-rocky-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1555,7 +1699,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-queens-ha-ipv6-baremetal-master' + - name: 'apex-os-nosdn-rocky-ha-ipv6-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1563,7 +1707,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-queens-noha-baremetal-master' + - name: 'apex-os-odl-rocky-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1571,7 +1715,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-queens-ha-baremetal-master' + - name: 'apex-os-odl-rocky-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1635,7 +1779,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc_queens-ha-baremetal-master' + - name: 'apex-os-odl-sfc_rocky-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1643,7 +1787,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc_queens-noha-baremetal-master' + - name: 'apex-os-odl-sfc_rocky-noha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1659,7 +1803,23 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso_queens-noha-baremetal-master' + - name: 'apex-os-nosdn-calipso_rocky-noha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-ovn-nofeature-ha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-ovn-rocky-ha-baremetal-master' node-parameters: false current-parameters: false predefined-parameters: | @@ -1838,6 +1998,7 @@ ####################### # trigger macros +# timed is in format: 'min hour daymonth month dayweek' ######################## - trigger: name: 'apex-master' @@ -1845,6 +2006,11 @@ - timed: '0 0 1-31/2 * *' - trigger: + name: 'apex-gambia' + triggers: + - timed: '0 4 2-30/2 * *' + +- trigger: name: 'apex-fraser' triggers: - timed: '0 0 2-30/2 * *' @@ -1858,3 +2024,78 @@ name: 'apex-danube' triggers: - timed: '0 3 1 1 7' + +- trigger: + name: 'master-master' + triggers: + - timed: '0 12 * * *' + +- trigger: + name: 'master-rocky' + triggers: + - timed: '0 12 * * *' + +- trigger: + name: 'master-queens' + triggers: + - timed: '' + +- trigger: + name: 'gambia-master' + triggers: + - timed: '' + +- trigger: + name: 'gambia-rocky' + triggers: + - timed: '' + +- trigger: + name: 'gambia-queens' + triggers: + - timed: '0 12 * * *' + +- trigger: + name: 'fraser-master' + triggers: + - timed: '' + +- trigger: + name: 'fraser-rocky' + triggers: + - timed: '' + +- trigger: + name: 'fraser-queens' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-master' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-rocky' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-queens' + triggers: + - timed: '' + +- trigger: + name: 'danube-master' + triggers: + - timed: '' + +- trigger: + name: 'danube-rocky' + triggers: + - timed: '' + +- trigger: + name: 'danube-queens' + triggers: + - timed: '' diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 31e3bd8f3..908acb62c 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -30,6 +30,16 @@ scenario_stream: 'master' disable_daily: false disable_promote: false + - gambia: &gambia + branch: 'stable/gambia' + gs-pathname: '/gambia' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-nosdn-nofeature-ha' + scenario_stream: 'gambia' + disable_daily: false + disable_promote: false - fraser: &fraser branch: 'stable/fraser' gs-pathname: '/fraser' @@ -75,15 +85,15 @@ - 'virtual' os_version: - - 'pike': - os_scenario: 'pike' - odl_branch: 'stable/carbon' - 'queens': - os_scenario: 'queens' + os_scenario: 'nofeature' + odl_branch: 'stable/oxygen' + - 'rocky': + os_scenario: 'rocky' odl_branch: 'stable/oxygen' - 'master': os_scenario: 'nofeature' - odl_branch: 'stable/oxygen' + odl_branch: 'stable/fluorine' topology: - 'noha' @@ -143,7 +153,7 @@ - logrotate-default - build-blocker: use-build-blocker: false - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-deploy.*' - throttle: @@ -220,7 +230,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-deploy.*' - 'functest.*' @@ -276,13 +286,14 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-runner.*' - 'apex-run.*' - 'apex-virtual-.*' - 'apex-verify-gate-.*' - 'odl-netvirt.*' + - 'apex-.*-promote.*' - throttle: max-per-node: 1 max-total: 10 @@ -380,7 +391,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -492,7 +503,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -607,7 +618,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-daily.*' @@ -734,7 +745,7 @@ properties: - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -747,7 +758,7 @@ option: 'project' triggers: - - timed: '0 12 * * 0' + - '{stream}-{os_version}' builders: - multijob: @@ -862,7 +873,7 @@ properties: - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-deploy.*' @@ -968,7 +979,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -1037,7 +1048,7 @@ - logrotate-default - build-blocker: use-build-blocker: true - block-level: 'NODE' + blocking-level: 'NODE' blocking-jobs: - 'apex-verify.*' - 'apex-runner.*' @@ -1169,6 +1180,7 @@ ####################### # trigger macros +# timed is in format: 'min hour daymonth month dayweek' ######################## - trigger: name: 'apex-master' @@ -1176,6 +1188,11 @@ - timed: '0 0 1-31/2 * *' - trigger: + name: 'apex-gambia' + triggers: + - timed: '0 4 2-30/2 * *' + +- trigger: name: 'apex-fraser' triggers: - timed: '0 0 2-30/2 * *' @@ -1189,3 +1206,78 @@ name: 'apex-danube' triggers: - timed: '0 3 1 1 7' + +- trigger: + name: 'master-master' + triggers: + - timed: '0 12 * * *' + +- trigger: + name: 'master-rocky' + triggers: + - timed: '0 12 * * *' + +- trigger: + name: 'master-queens' + triggers: + - timed: '' + +- trigger: + name: 'gambia-master' + triggers: + - timed: '' + +- trigger: + name: 'gambia-rocky' + triggers: + - timed: '' + +- trigger: + name: 'gambia-queens' + triggers: + - timed: '0 12 * * *' + +- trigger: + name: 'fraser-master' + triggers: + - timed: '' + +- trigger: + name: 'fraser-rocky' + triggers: + - timed: '' + +- trigger: + name: 'fraser-queens' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-master' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-rocky' + triggers: + - timed: '' + +- trigger: + name: 'euphrates-queens' + triggers: + - timed: '' + +- trigger: + name: 'danube-master' + triggers: + - timed: '' + +- trigger: + name: 'danube-rocky' + triggers: + - timed: '' + +- trigger: + name: 'danube-queens' + triggers: + - timed: '' diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index 1e1ba3fc3..a221699f1 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -4,11 +4,11 @@ master: - 'os-nosdn-nofeature-ha-ipv6' - 'os-odl-nofeature-noha' - 'os-odl-nofeature-ha' - - 'os-nosdn-queens-noha' - - 'os-nosdn-queens-ha' - - 'os-nosdn-queens-ha-ipv6' - - 'os-odl-queens-noha' - - 'os-odl-queens-ha' + - 'os-nosdn-rocky-noha' + - 'os-nosdn-rocky-ha' + - 'os-nosdn-rocky-ha-ipv6' + - 'os-odl-rocky-noha' + - 'os-odl-rocky-ha' - 'k8s-nosdn-nofeature-noha' - 'os-odl-bgpvpn-ha' - 'os-odl-bgpvpn-noha' @@ -16,10 +16,25 @@ master: - 'os-odl-bgpvpn_queens-noha' - 'os-odl-sfc-ha' - 'os-odl-sfc-noha' - - 'os-odl-sfc_queens-ha' - - 'os-odl-sfc_queens-noha' + - 'os-odl-sfc_rocky-ha' + - 'os-odl-sfc_rocky-noha' - 'os-nosdn-calipso-noha' - - 'os-nosdn-calipso_queens-noha' + - 'os-nosdn-calipso_rocky-noha' + - 'os-ovn-nofeature-ha' + - 'os-ovn-rocky-ha' +gambia: + - 'os-nosdn-nofeature-noha' + - 'os-nosdn-nofeature-ha' + - 'os-nosdn-nofeature-ha-ipv6' + - 'os-odl-nofeature-noha' + - 'os-odl-nofeature-ha' + - 'k8s-nosdn-nofeature-noha' + - 'os-odl-bgpvpn-ha' + - 'os-odl-bgpvpn-noha' + - 'os-odl-sfc-ha' + - 'os-odl-sfc-noha' + - 'os-nosdn-calipso-noha' + - 'os-ovn-nofeature-ha' fraser: - 'os-nosdn-nofeature-ha' - 'os-odl-bgpvpn-ha' |