From 471df7d269a12631edac795371522802380306ee Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 24 Mar 2020 18:45:29 +0000 Subject: [PATCH] Create separate macros for ONAP baremetal jobs Change-Id: Id0f849c78ece7e13aa3776243d59da67e14637d2 --- .../cloud-infra-periodic-onap-baremetal.yaml | 14 ++-- jjb/cloud-infra/onap-deploy-baremetal.sh | 76 +++++++++++++++++++ jjb/cloud-infra/onap-healthcheck-baremetal.sh | 33 ++++++++ jjb/cloud-infra/onap-macros.yaml | 20 +++++ 4 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 jjb/cloud-infra/onap-deploy-baremetal.sh create mode 100644 jjb/cloud-infra/onap-healthcheck-baremetal.sh diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml index f3eef6d5f..646888022 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap-baremetal.yaml @@ -67,8 +67,8 @@ - oom-hc: build-timeout: 30 test-type: oom-healthcheck - - promote-onap: - build-timeout: 240 +# - promote-onap: +# build-timeout: 240 onap-healthcheck-phases: - onap-hc-core: @@ -181,7 +181,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | baremetal - multijob: name: Deploy ONAP using OOM condition: ALWAYS @@ -436,8 +436,8 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - - '{onap-other-phases}-macro' + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | baremetal + - '{onap-other-phases}-baremetal-macro' - job-template: name: '{onap-healthcheck-phases}-{distro}-{installer-type}-baremetal-{ci-loop}-{onap-branch}' @@ -516,7 +516,7 @@ builders: - description-setter: - description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER - - 'onap-healthcheck-macro' + description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | baremetal + - 'onap-healthcheck-baremetal-macro' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/cloud-infra/onap-deploy-baremetal.sh b/jjb/cloud-infra/onap-deploy-baremetal.sh new file mode 100644 index 000000000..42cc7cfe2 --- /dev/null +++ b/jjb/cloud-infra/onap-deploy-baremetal.sh @@ -0,0 +1,76 @@ +#!/bin/bash + +# ============LICENSE_START======================================================= +# Copyright (C) 2019 The Nordix Foundation. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= + +set -o errexit +set -o nounset + +cd $WORKSPACE +/bin/rm -f ../inventory.ini +echo "Info: Preparing for ONAP deployment" + +# checkout given engine version +if [[ "$ENGINE_VERSION" != "master" ]]; then + echo "Warning: Checking out $ENGINE_VERSION" + git checkout -q $ENGINE_VERSION +fi + +# checkout given engine refspec +if [[ "$ENGINE_REFSPEC" != "master" ]]; then + echo "Warning: Checking out engine $ENGINE_REFSPEC" + echo "-------------------------------------------------------------------------" + git fetch https://gerrit.nordix.org/infra/engine $ENGINE_REFSPEC && git checkout -q FETCH_HEAD + echo "-------------------------------------------------------------------------" +fi + +# update scenario version and refspec in engine/envine/var/sdf.yml +if [[ "$DEPLOY_SCENARIO_VERSION" != "master" && "$DEPLOY_SCENARIO_REFSPEC" != "master" ]]; then + echo "Warning: Adding $DEPLOY_SCENARIO_VERSION as scenario version and $DEPLOY_SCENARIO_REFSPEC as scenario refspec" +cat << EOF > $WORKSPACE/engine/var/sdf.yml +scenario: + $DEPLOY_SCENARIO: + scm: git + src: https://gerrit.nordix.org/infra/swconfig.git + version: $DEPLOY_SCENARIO_VERSION + refspec: $DEPLOY_SCENARIO_REFSPEC + provisioners: + - $PROVISIONER_TYPE + installers: + $INSTALLER_TYPE: + role: scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO + distros: + - $DISTRO +EOF + + echo "Info: Temporary SDF content" + echo "-------------------------------------------------------------------------" + cat $WORKSPACE/engine/var/sdf.yml + echo "-------------------------------------------------------------------------" +fi + +echo "Info: Starting K8S cluster creation and ONAP deployment" +echo "-------------------------------------------------------------------------" +cd $WORKSPACE +./engine/deploy.sh -d $INSTALLER_TYPE -r $PROVISIONER_TYPE -s $DEPLOY_SCENARIO -v \ + -p "https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-pdf.yml" \ + -i "https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/${NODE_NAME}-idf.yml" + +cd $WORKSPACE +/bin/cp /opt/engine/.cache/config/inventory.ini ../inventory.ini +# vim: set ts=2 sw=2 expandtab: diff --git a/jjb/cloud-infra/onap-healthcheck-baremetal.sh b/jjb/cloud-infra/onap-healthcheck-baremetal.sh new file mode 100644 index 000000000..6099d0bf2 --- /dev/null +++ b/jjb/cloud-infra/onap-healthcheck-baremetal.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# ============LICENSE_START======================================================= +# Copyright (C) 2019 The Nordix Foundation. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= + +set -o errexit +set -o nounset + +cd $WORKSPACE +echo "Info: Starting ${TEST_TYPE}-${ONAP_FLAVOR} using Xtesting" +echo "-------------------------------------------------------------------------" +echo "Info: Cloning opnfv/xtesting-onap repository" +cd $HOME && /bin/rm -rf $WORKSPACE +git clone -q $XTESTING_REPO_URL $WORKSPACE && cd $WORKSPACE +cp /tmp/inventory.ini inventory/inventory.ini +$WORKSPACE/xtesting.sh + +# vim: set ts=2 sw=2 expandtab: diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml index 7cfac2e7a..0771a145b 100644 --- a/jjb/cloud-infra/onap-macros.yaml +++ b/jjb/cloud-infra/onap-macros.yaml @@ -67,18 +67,38 @@ - shell: !include-raw: ./onap-deploy.sh +- builder: + name: 'onap-deploy-baremetal-macro' + builders: + - shell: + !include-raw: ./wait-for-pkg-manager.sh + - shell: + !include-raw: ./onap-deploy-baremetal.sh + - builder: name: 'oom-hc-macro' builders: - shell: !include-raw: ./oom-healthcheck.sh +- builder: + name: 'oom-hc-baremetal-macro' + builders: + - shell: + !include-raw: ./oom-healthcheck.sh + - builder: name: 'onap-healthcheck-macro' builders: - shell: !include-raw: ./onap-healthcheck.sh +- builder: + name: 'onap-healthcheck-baremetal-macro' + builders: + - shell: + !include-raw: ./onap-healthcheck.sh + - builder: name: 'promote-onap-macro' builders: -- 2.25.1