From c01b6d5c7b6e33ed66b972dba5f2d3edfd9ce477 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 30 Jul 2019 13:51:09 +0200 Subject: [PATCH] Pin engine and scenario versions to patch versions Change-Id: I8a9d9fe0b5127e81ce56b6cc4024a601cad327cc --- .../cloud-infra-periodic-onap.yaml | 31 ++++++------------- jjb/cloud-infra/onap-deploy.sh | 5 ++- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index ead70772..dd812fb2 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -46,9 +46,9 @@ onap-version: 4.0.0-ONAP onap-flavor: full engine-version: master - engine-refspec: master - deploy-scenario-version: master - deploy-scenario-refspec: master + engine-refspec: "refs/changes/71/1771/4" + deploy-scenario-version: "9a215b7935ab2b14cc7451ba15ea575e62e26da7" + deploy-scenario-refspec: "refs/changes/65/1765/12" disabled: false - 'master': nordix-branch: master @@ -122,10 +122,6 @@ name: DEPLOY_SCENARIO default: '{deploy-scenario}' description: 'Scenario to deploy and test' - - string: - name: HEAT_ENVIRONMENT_FILE - default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/heat-environment-full.yaml" - description: 'Type of the deployment' - string: name: DEPLOY_TYPE default: '{type}' @@ -210,10 +206,9 @@ predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=$ONAP_FLAVOR ENGINE_VERSION=$ENGINE_VERSION @@ -236,8 +231,7 @@ predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO ONAP_VERSION=$ONAP_VERSION @@ -262,10 +256,9 @@ predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=core TEST_TYPE=onap-healthcheck @@ -285,10 +278,9 @@ predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=small TEST_TYPE=onap-healthcheck @@ -308,10 +300,9 @@ predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=medium TEST_TYPE=onap-healthcheck @@ -331,10 +322,9 @@ predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - PROVISIIONER_TYPE=$PROVISIIONER_TYPE + PROVISIONER_TYPE=$PROVISIONER_TYPE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE ONAP_VERSION=$ONAP_VERSION ONAP_FLAVOR=full TEST_TYPE=onap-healthcheck @@ -358,7 +348,6 @@ predefined-parameters: | DISTRO=$DISTRO DEPLOY_TYPE=$DEPLOY_TYPE - HEAT_ENVIRONMENT_FILE=$HEAT_ENVIRONMENT_FILE INSTALLER_TYPE=$INSTALLER_TYPE DEPLOY_SCENARIO=$DEPLOY_SCENARIO ONAP_VERSION=$ONAP_VERSION @@ -477,7 +466,7 @@ builders: - description-setter: - description: $TEST_TYPE $ONAP_FLAVOR + description: $INSTALLER_TYPE $DEPLOY_SCENARIO - '{phase}-macro' # vim: set ts=2 sw=2 expandtab: diff --git a/jjb/cloud-infra/onap-deploy.sh b/jjb/cloud-infra/onap-deploy.sh index deaa9ede..7cf0d6d0 100644 --- a/jjb/cloud-infra/onap-deploy.sh +++ b/jjb/cloud-infra/onap-deploy.sh @@ -22,6 +22,7 @@ set -o errexit set -o nounset cd $WORKSPACE +/bin/rm -f ../inventory.ini echo "Info: Preparing for ONAP deployment" # checkout given engine version @@ -66,7 +67,9 @@ fi echo "Info: Starting K8S cluster creation and ONAP deployment" echo "-------------------------------------------------------------------------" cd $WORKSPACE -./deploy.sh -c -r $PROVISIONER_TYPE -u $OPENRC_FILE \ +./engine/deploy.sh -c -r $PROVISIONER_TYPE -u $OPENRC_FILE \ -s $DEPLOY_SCENARIO -e $HEAT_ENVIRONMENT_FILE +cd $WORKSPACE +/bin/cp $WORKSPACE/.cache/config/inventory.ini ../inventory.ini # vim: set ts=2 sw=2 expandtab: -- 2.25.1