From: Michal Ptacek <m.ptacek@partner.samsung.com>
Date: Wed, 29 May 2019 14:56:50 +0000 (+0000)
Subject: Changing patchfile naming convention
X-Git-Tag: 6.0.0-ONAP~182
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F88782%2F1;p=oom%2Foffline-installer.git

Changing patchfile naming convention

Its not needed to preserve onap release version in
patch naming.

Change-Id: I8dfaa56d3a74cd5227523c3acd5e31fa540a75a2
Issue-ID: OOM-1869
Signed-off-by: Michal Ptacek <m.ptacek@partner.samsung.com>
---

diff --git a/build/fetch_and_patch_charts.sh b/build/fetch_and_patch_charts.sh
index c5585584..79d7a01e 100755
--- a/build/fetch_and_patch_charts.sh
+++ b/build/fetch_and_patch_charts.sh
@@ -37,7 +37,7 @@ C_='\033[0m'            #Color off
 usage () {
     echo "Usage:"
     echo -e "./$(basename $0) <helm charts repo> <commit/tag/branch> <patchfile> <target_dir>\n"
-    echo "Example: ./$(basename $0) https://gerrit.onap.org/r/oom 3.0.2-ONAP /root/offline-installer/patches/casablanca.patch /root/offline-installer/ansible/application/helm_charts"
+    echo "Example: ./$(basename $0) https://gerrit.onap.org/r/oom master /root/offline-installer/patches/onap.patch /root/offline-installer/ansible/application/helm_charts"
 }
 
 if [ "$#" -ne 4 ]; then
diff --git a/build/package.conf b/build/package.conf
index 7d6a1b8f..d74eac0a 100644
--- a/build/package.conf
+++ b/build/package.conf
@@ -54,7 +54,7 @@ HELM_CHARTS_DIR=/tmp/oom-clone/kubernetes
 #)
 APP_CONFIGURATION=(
     /tmp/offline-installer/config/application_configuration.yml
-    /tmp/offline-installer/patches/onap-casablanca-patch-role
+    /tmp/offline-installer/patches/onap-patch-role
 )
 
 # APP_BINARY_RESOURCES_DIR is variable to directory containing directories and files for offline
diff --git a/config/application_configuration.yml b/config/application_configuration.yml
index d8970585..2e397f4c 100755
--- a/config/application_configuration.yml
+++ b/config/application_configuration.yml
@@ -7,7 +7,7 @@
 #
 resources_dir: /data
 app_name: onap
-resources_filename: "offline-{{ app_name }}-3.0.2.resources.tar"
+resources_filename: "offline-{{ app_name }}-4.0.0.resources.tar"
 app_data_path: "/opt/{{ app_name }}"
 certificates:
   organization_name: Samsung
@@ -18,4 +18,4 @@ app_helm_build_targets:
   - all
   - onap
 app_helm_chart_name: onap
-application_pre_install_role: "onap-casablanca-patch-role"
+application_pre_install_role: "onap-patch-role"
diff --git a/docs/BuildGuide.rst b/docs/BuildGuide.rst
index 8ae08d8d..bb0e4cca 100644
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -273,7 +273,7 @@ For example:
 
 ::
 
-  ./build/fetch_and_patch_charts.sh https://gerrit.onap.org/r/oom 3.0.2-ONAP /tmp/onap-offline/patches/casablanca.patch /tmp/oom-clone
+  ./build/fetch_and_patch_charts.sh https://gerrit.onap.org/r/oom master /tmp/onap-offline/patches/onap.patch /tmp/oom-clone
 
 Part 5. Creating offline installation package
 ---------------------------------------------
@@ -298,8 +298,8 @@ Example values below are setup according to steps done in this guide to package
 |                                       | Example::                                                                    |
 |                                       |                                                                              |
 |                                       |  APP_CONFIGURATION=(                                                         |
-|                                       |     /tmp/onap-offline/config/application_configuration.yml              |
-|                                       |     /tmp/onap-offline/patches/onap-casablanca-patch-role                |
+|                                       |     /tmp/onap-offline/config/application_configuration.yml                   |
+|                                       |     /tmp/onap-offline/patches/onap-patch-role                                |
 |                                       |  )                                                                           |
 |                                       |                                                                              |
 +---------------------------------------+------------------------------------------------------------------------------+
diff --git a/patches/onap-dublin-patch-role/tasks/main.yml b/patches/onap-patch-role/tasks/main.yml
similarity index 100%
rename from patches/onap-dublin-patch-role/tasks/main.yml
rename to patches/onap-patch-role/tasks/main.yml
diff --git a/patches/dublin.patch b/patches/onap.patch
similarity index 100%
rename from patches/dublin.patch
rename to patches/onap.patch