aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-12-18 16:09:24 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-12-18 16:19:29 +0100
commit3b218184c8ed7e6ba8c3de1336305963a8da69ba (patch)
treefb2702ae295be76b830c812d4e5804e615220137
parentb1c96fac90bffb7d3ac20a4d096f67bda33185ea (diff)
deploy-cache: Move Fuel@OPNFV patch to proper dir
stable/colorado keeps Fuel@OPNFV patches for fuel-main in <patch-repos>, instead of master's <f_repos/patch/fuel-main/> dir. This leads to our bootstrap_admin_node.sh additions being silently ommitted during build. Change-Id: Ida14a64d20c581203723c479df2e8406f9bd93c6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch b/patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
index d72b521..79f74ac 100644
--- a/patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
+++ b/patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
@@ -30,14 +30,14 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
deploy/deploy_env.py | 13 +-
deploy/install_fuel_master.py | 9 +-
7 files changed, 454 insertions(+), 9 deletions(-)
- create mode 100644 build/f_repos/patch/fuel-main/0006-bootstrap_admin_node.sh-deploy_cache-install-hook.patch
+ create mode 100644 build/patch-repos/0016-bootstrap_admin_node.sh-deploy_cache-install-hook.patch
create mode 100644 deploy/deploy_cache.py
-diff --git a/build/f_repos/patch/fuel-main/0006-bootstrap_admin_node.sh-deploy_cache-install-hook.patch b/build/f_repos/patch/fuel-main/0006-bootstrap_admin_node.sh-deploy_cache-install-hook.patch
+diff --git a/build/patch-repos/0016-bootstrap_admin_node.sh-deploy_cache-install-hook.patch b/build/patch-repos/0016-bootstrap_admin_node.sh-deploy_cache-install-hook.patch
new file mode 100644
index 0000000..80cd0f4
--- /dev/null
-+++ b/build/f_repos/patch/fuel-main/0006-bootstrap_admin_node.sh-deploy_cache-install-hook.patch
++++ b/build/patch-repos/0016-bootstrap_admin_node.sh-deploy_cache-install-hook.patch
@@ -0,0 +1,69 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Mon, 28 Nov 2016 14:27:48 +0100