[Bug] Install cookbook dependencies in all regions

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-platform/recipes/install/cookbook_virtualenv.rb

@@ -13,7 +13,7 @@
 
 virtualenv_path = cookbook_virtualenv_path
 dependency_package_name = "pypi-cookbook-dependencies-#{node['cluster']['python-major-minor-version']}-#{node['kernel']['machine']}"
-pypi_s3_uri = "#{node['cluster']['artifacts_s3_url']}/dependencies/PyPi/#{dependency_package_name}.tgz"
+pypi_s3_uri = "#{node['cluster']['artifacts_s3_url']}/dependencies/PyPi/#{node['kernel']['machine']}/#{dependency_package_name}.tgz"
 if platform?('amazon') && node['platform_version'] == "2"
   dependency_package_name = "dependencies"
   pypi_s3_uri = "#{node['cluster']['artifacts_s3_url']}/dependencies/PyPi/#{node['kernel']['machine']}/cookbook-dependencies.tgz"
@@ -33,24 +33,22 @@
   not_if { ::File.exist?("#{cookbook_virtualenv_path}/bin/activate") }
 end
 
-if aws_region.start_with?("us-iso")
-  remote_file "#{node['cluster']['base_dir']}/cookbook-dependencies.tgz" do
-    source pypi_s3_uri
-    mode '0644'
-    retries 3
-    retry_delay 5
-    action :create_if_missing
-  end
+remote_file "#{node['cluster']['base_dir']}/cookbook-dependencies.tgz" do
+  source pypi_s3_uri
+  mode '0644'
+  retries 3
+  retry_delay 5
+  action :create_if_missing
+end
 
-  bash 'pip install' do
-    user 'root'
-    group 'root'
-    cwd "#{node['cluster']['base_dir']}"
-    code <<-REQ
-    set -e
-    tar xzf cookbook-dependencies.tgz
-    cd #{dependency_package_name}
-    #{virtualenv_path}/bin/pip install * -f ./ --no-index
-    REQ
-  end
+bash 'pip install' do
+  user 'root'
+  group 'root'
+  cwd "#{node['cluster']['base_dir']}"
+  code <<-REQ
+  set -e
+  tar xzf cookbook-dependencies.tgz
+  cd #{dependency_package_name}
+  #{virtualenv_path}/bin/pip install * -f ./ --no-index
+  REQ
 end

cookbooks/aws-parallelcluster-platform/spec/unit/recipes/cookbook_virtualenv_spec.rb

@@ -6,7 +6,7 @@
       cached(:python_version) { 'python_version' }
       cached(:system_pyenv_root) { 'system_pyenv_root' }
       cached(:virtualenv_path) { 'system_pyenv_root/versions/python_version/envs/cookbook_virtualenv' }
-      cached(:aws_region) { 'us-iso-test' }
+      cached(:aws_region) { 'any-region' }
 
       context "when cookbook virtualenv not installed yet" do
         cached(:chef_run) do
@@ -35,14 +35,12 @@
           expect(node.default['cluster']['cookbook_virtualenv_path']).to eq(virtualenv_path)
           is_expected.to write_node_attributes('dump node attributes')
         end
-        context "when in isolated region" do
-          it 'installs python packages' do
-            is_expected.to run_bash("pip install").with(
-              user: 'root',
-              group: 'root',
-              cwd: "#{node['cluster']['base_dir']}"
-            ).with_code(/tar xzf cookbook-dependencies.tgz/)
-          end
+        it 'installs python packages' do
+          is_expected.to run_bash("pip install").with(
+            user: 'root',
+            group: 'root',
+            cwd: "#{node['cluster']['base_dir']}"
+          ).with_code(/tar xzf cookbook-dependencies.tgz/)
         end
       end
     end