From 37d753db5e2823c7d488f5101a80e0103d767104 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Thu, 27 Dec 2012 18:38:39 +0400 Subject: [PATCH] [mirror] Solved PRD-232 (do not download source files if they have been already downloaded) --- mirror/module.mk | 8 ++++--- scripts/ci/sample-cook/README.md | 0 scripts/ci/sample-cook/attributes/exposed.rb | 2 -- scripts/ci/sample-cook/metadata.rb | 9 -------- scripts/ci/sample-cook/recipes/compute.rb | 2 -- scripts/ci/sample-cook/recipes/crazy | 0 scripts/ci/sample-cook/recipes/default.rb | 2 -- scripts/ci/sample-cook/recipes/monitor.rb | 1 - scripts/ci/sample-release.json | 22 -------------------- scripts/ci/solo.json | 7 ------- scripts/ci/solo.rb | 9 -------- scripts/release/openstack-essex.json | 11 ---------- 12 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 scripts/ci/sample-cook/README.md delete mode 100644 scripts/ci/sample-cook/attributes/exposed.rb delete mode 100644 scripts/ci/sample-cook/metadata.rb delete mode 100644 scripts/ci/sample-cook/recipes/compute.rb delete mode 100644 scripts/ci/sample-cook/recipes/crazy delete mode 100644 scripts/ci/sample-cook/recipes/default.rb delete mode 100644 scripts/ci/sample-cook/recipes/monitor.rb delete mode 100644 scripts/ci/sample-release.json delete mode 100644 scripts/ci/solo.json delete mode 100644 scripts/ci/solo.rb delete mode 100644 scripts/release/openstack-essex.json diff --git a/mirror/module.mk b/mirror/module.mk index 76a49907e..63d1a67f2 100644 --- a/mirror/module.mk +++ b/mirror/module.mk @@ -238,11 +238,13 @@ else SRC_URLS:=$(shell grep -v ^\\s*\# requirements-src.txt | sed "s=.*/\(.*\)=$(MIRROR_URL)/src/\1=") endif -$/src.done: - @mkdir -p $/src - wget --no-use-server-timestamps -c -P $/src $(SRC_URLS) +$/src.done: | $(addprefix $/src/, $(notdir $(SRC_URLS))) $(ACTION.TOUCH) +$(addprefix $/src/, $(notdir $(SRC_URLS))): + @mkdir -p $/src + wget --no-use-server-timestamps -c -P $/src $@ + $/gems-bundle.done: $/gems-bundle-gemfile.done ( cd $/gems-bundle && bundle install --path ./ && bundle package ) ( cd $/gems-bundle/vendor/cache/ && gem fetch -v 1.2.1 bundler ) diff --git a/scripts/ci/sample-cook/README.md b/scripts/ci/sample-cook/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/scripts/ci/sample-cook/attributes/exposed.rb b/scripts/ci/sample-cook/attributes/exposed.rb deleted file mode 100644 index 8cc7bb0c1..000000000 --- a/scripts/ci/sample-cook/attributes/exposed.rb +++ /dev/null @@ -1,2 +0,0 @@ -default[:head_key][:nested_key] = "value" -default[:service][:password] = "password" # Let's use this for password generation check diff --git a/scripts/ci/sample-cook/metadata.rb b/scripts/ci/sample-cook/metadata.rb deleted file mode 100644 index 7024d5905..000000000 --- a/scripts/ci/sample-cook/metadata.rb +++ /dev/null @@ -1,9 +0,0 @@ -maintainer "Mirantis, Inc." -maintainer_email "product@mirantis.com" -license "Apache 2.0" -description "Cookbook for testing purposes" -long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.3.0" -name "sample-cook" - -#depends "apt" diff --git a/scripts/ci/sample-cook/recipes/compute.rb b/scripts/ci/sample-cook/recipes/compute.rb deleted file mode 100644 index ab0225f2b..000000000 --- a/scripts/ci/sample-cook/recipes/compute.rb +++ /dev/null @@ -1,2 +0,0 @@ -# depends: "sample-cook::default@0.3.0" -File.open('/tmp/chef_success', 'a') {|f| f.puts("compute") } \ No newline at end of file diff --git a/scripts/ci/sample-cook/recipes/crazy b/scripts/ci/sample-cook/recipes/crazy deleted file mode 100644 index e69de29bb..000000000 diff --git a/scripts/ci/sample-cook/recipes/default.rb b/scripts/ci/sample-cook/recipes/default.rb deleted file mode 100644 index 0ab6641b3..000000000 --- a/scripts/ci/sample-cook/recipes/default.rb +++ /dev/null @@ -1,2 +0,0 @@ -# depends: "sample-cook::monitor@0.3.0" -File.open('/tmp/chef_success', 'a') {|f| f.puts("default") } diff --git a/scripts/ci/sample-cook/recipes/monitor.rb b/scripts/ci/sample-cook/recipes/monitor.rb deleted file mode 100644 index daf876a2a..000000000 --- a/scripts/ci/sample-cook/recipes/monitor.rb +++ /dev/null @@ -1 +0,0 @@ -File.open('/tmp/chef_success', 'a') {|f| f.puts("monitor") } \ No newline at end of file diff --git a/scripts/ci/sample-release.json b/scripts/ci/sample-release.json deleted file mode 100644 index 1e473315f..000000000 --- a/scripts/ci/sample-release.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "Sample release", - "version": "1.0.0", - "description": "Description for Release", - "networks_metadata": [ - {"name": "floating", "access": "public"}, - {"name": "management", "access": "private10"}, - {"name": "storage", "access": "private172"} - ], - "attributes_metadata": { - "editable": { - "keystone": { - "admin_tenant": "admin" - } - }, - "generated": { - "mysql": { - "root_password": "" - } - } - } -} diff --git a/scripts/ci/solo.json b/scripts/ci/solo.json deleted file mode 100644 index 3ec8d4a7b..000000000 --- a/scripts/ci/solo.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "recipes": [ "nailgun::deps", "devops::deps" ], - "mysql": { - "server_root_password": "ololo" - } -} - diff --git a/scripts/ci/solo.rb b/scripts/ci/solo.rb deleted file mode 100644 index ce0ee12f6..000000000 --- a/scripts/ci/solo.rb +++ /dev/null @@ -1,9 +0,0 @@ -# To run chef-solo from this folder use the following command: -# sudo chef-solo -l debug -c solo.rb -j solo.json -#require 'syslog_logger' - -#log_location SyslogLogger.new("chef-solo") -log_location open("| logger -t chef-solo", "w") - -file_cache_path "/tmp/chef" -cookbook_path File.expand_path(File.join(File.dirname(__FILE__), '../../vagrant/cookbooks')) diff --git a/scripts/release/openstack-essex.json b/scripts/release/openstack-essex.json deleted file mode 100644 index 2efa743b1..000000000 --- a/scripts/release/openstack-essex.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "OpenStack Essex Release", - "version": "0.1.0", - "description": "Alpha release", - "networks_metadata": [ - {"name": "floating", "access": "public"}, - {"name": "public", "access": "public"}, - {"name": "management", "access": "private10"}, - {"name": "storage", "access": "private172"} - ] -} \ No newline at end of file