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 c558558..79d7a01 100755
--- a/build/fetch_and_patch_charts.sh
+++ b/build/fetch_and_patch_charts.sh
@@ -37,7 +37,7 @@
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 7d6a1b8..d74eac0 100644
--- a/build/package.conf
+++ b/build/package.conf
@@ -54,7 +54,7 @@
#)
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 d897058..2e397f4 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 @@
- 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 8ae08d8..bb0e4cc 100644
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -273,7 +273,7 @@
::
- ./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:: |
| | |
| | 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