From e830ea142a4b760cf152d9db92c451d74b2da1f2 Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Wed, 28 Jun 2023 12:15:14 +0100 Subject: Make update to allow local image to be used in Nordix Change-Id: I6be9de1afa529c0d6f20ecfd594a1b48a45b543a Issue-ID: POLICY-4647 Signed-off-by: zrrmmua (cherry picked from commit bdced49a2f16f1787088aa4f1013d8a07be51ec4) --- compose/loaddockerimage.sh | 112 +++++++++++++++++++++++++++++++++++++++++++++ csit/run-k8s-csit.sh | 14 +++++- 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100755 compose/loaddockerimage.sh diff --git a/compose/loaddockerimage.sh b/compose/loaddockerimage.sh new file mode 100755 index 00000000..1945b799 --- /dev/null +++ b/compose/loaddockerimage.sh @@ -0,0 +1,112 @@ +#! /bin/bash -x + +# ============LICENSE_START==================================================== +# Copyright (C) 2023 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====================================================== + +# This script gets executed in Nordix infra for consuming locally generated docker images for k8s tests. + +if [ -z "${WORKSPACE}" ]; then + WORKSPACE=$(git rev-parse --show-toplevel) + export WORKSPACE +fi + + + +echo "Setting project configuration for: $PROJECT" +case $PROJECT in + +clamp | policy-clamp) + echo "CLAMP" + env + if [ "$(docker images nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:$POLICY_CLAMP_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:$POLICY_CLAMP_VERSION -o ./runtime_image.tar + microk8s images import ./runtime_image.tar + fi + if [ "$(docker images nexus3.onap.org:10001/onap/policy-clamp-ac-http-ppnt:$POLICY_CLAMP_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-clamp-ac-http-ppnt:$POLICY_CLAMP_VERSION -o ./http_ppnt_image.tar + microk8s images import ./http_ppnt_image.tar + fi + if [ "$(docker images nexus3.onap.org:10001/onap/policy-clamp-ac-k8s-ppnt:$POLICY_CLAMP_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-clamp-ac-k8s-ppnt:$POLICY_CLAMP_VERSION -o ./k8s_ppnt_image.tar + microk8s images import ./k8s_ppnt_image.tar + fi + if [ "$(docker images nexus3.onap.org:10001/onap/policy-clamp-ac-pf-ppnt:$POLICY_CLAMP_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-clamp-ac-pf-ppnt:$POLICY_CLAMP_VERSION -o ./pf_ppnt_image.tar + microk8s images import ./pf_ppnt_image.tar + fi + ;; + +api | policy-api) + echo "API" + env + if [ "$(docker images nexus3.onap.org:10001/onap/policy-api:$POLICY_API_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-api:$POLICY_API_VERSION -o ./image.tar + microk8s images import ./image.tar + fi + ;; + +pap | policy-pap) + echo "PAP" + env + if [ "$(docker images nexus3.onap.org:10001/onap/policy-pap:$POLICY_PAP_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-pap:$POLICY_PAP_VERSION -o ./image.tar + microk8s images import ./image.tar + fi + ;; + +apex-pdp | policy-apex-pdp) + echo "APEX" + env + if [ "$(docker images nexus3.onap.org:10001/onap/policy-apex-pdp:$POLICY_APEX_PDP_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-apex-pdp:$POLICY_APEX_PDP_VERSION -o ./image.tar + microk8s images import ./image.tar + fi + ;; + +xacml-pdp | policy-xacml-pdp) + echo "XACML" + env + if [ "$(docker images nexus3.onap.org:10001/onap/policy-xacml-pdp:$POLICY_XACML_PDP_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-xacml-pdp:$POLICY_XACML_PDP_VERSION -o ./image.tar + microk8s images import ./image.tar + fi + ;; + +drools-pdp | policy-drools-pdp) + echo "DROOLS" + env + if [ "$(docker images nexus3.onap.org:10001/onap/policy-pdpd-cl:$POLICY_DROOLS_PDP_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-pdpd-cl:$POLICY_DROOLS_PDP_VERSION -o ./image.tar + microk8s images import ./image.tar + fi + ;; + +distribution | policy-distribution) + echo "DISTRIBUTION" + env + if [ "$(docker images nexus3.onap.org:10001/onap/policy-distribution:$POLICY_DISTRIBUTION_VERSION | grep -v REPOSITORY | wc -l)" == 1 ]; then + docker save nexus3.onap.org:10001/onap/policy-distribution:$POLICY_DISTRIBUTION_VERSION -o ./image.tar + microk8s images import ./image.tar + fi + ;; + +*) + echo "UNKNOWN" + ;; +esac diff --git a/csit/run-k8s-csit.sh b/csit/run-k8s-csit.sh index 758617af..d383d1a1 100755 --- a/csit/run-k8s-csit.sh +++ b/csit/run-k8s-csit.sh @@ -284,6 +284,13 @@ function push_acelement_chart() { OPERATION="$1" PROJECT="$2" +if [ -z "$3" ] +then + LOCALIMAGE="false" +else + LOCALIMAGE="$3" +fi + if [ $OPERATION == "install" ]; then spin_microk8s_cluster @@ -291,6 +298,11 @@ if [ $OPERATION == "install" ]; then set_project_config echo "Installing policy helm charts in the default namespace" source ${WORKSPACE}/compose/get-k8s-versions.sh + if [ $LOCALIMAGE == "true" ]; then + echo "loading local image" + source ${WORKSPACE}/compose/get-versions.sh + ${WORKSPACE}/compose/loaddockerimage.sh + fi cd ${WORKSPACE}/helm || exit sudo microk8s helm dependency build policy sudo microk8s helm install csit-policy policy ${SET_VALUES} @@ -316,5 +328,5 @@ elif [ $OPERATION == "clean" ]; then teardown_cluster else - echo "Invalid arguments provided. Usage: $0 [options..] {install {project_name} | uninstall | clean}" + echo "Invalid arguments provided. Usage: $0 [options..] {install {project_name} | uninstall | clean} {uselocalimage = true/false}" fi -- cgit 1.2.3-korg