Skip to content

Commit 39fe7b4

Browse files
author
Himani Anil Deshpande
committed
Revert "Update the efs-utils to use a different Cargo.toml"
This reverts commit 20b88c9
1 parent d42fcb0 commit 39fe7b4

File tree

5 files changed

+6
-82
lines changed

5 files changed

+6
-82
lines changed

cookbooks/aws-parallelcluster-environment/files/efs/Cargo.toml

Lines changed: 0 additions & 40 deletions
This file was deleted.

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_debian.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
1414
# See the License for the specific language governing permissions and limitations under the License.
1515

16-
def install_script_code(_efs_utils_tarball, efs_utils_package, efs_utils_version)
16+
def install_script_code(efs_utils_tarball, efs_utils_package, efs_utils_version)
1717
<<-EFSUTILSINSTALL
1818
set -e
19+
tar xf #{efs_utils_tarball}
1920
cd efs-utils-#{efs_utils_version}
2021
./build-deb.sh
2122
apt-get -y install ./build/#{efs_utils_package}*deb

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_install_from_tar.rb

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,6 @@
5050
action :create_if_missing
5151
end
5252

53-
bash "Untar the efs-utils" do
54-
cwd node['cluster']['sources_dir']
55-
code <<-EFSUTILSUNTAR
56-
set -e
57-
tar xf #{efs_utils_tarball}
58-
EFSUTILSUNTAR
59-
end
60-
61-
cookbook_file "#{node['cluster']['sources_dir']}/efs-utils-#{package_version}/src/proxy/Cargo.toml" do
62-
source 'efs/Cargo.toml'
63-
owner 'root'
64-
group 'root'
65-
mode '0755'
66-
action :create
67-
end
68-
6953
# Install EFS Utils following https://docs.aws.amazon.com/efs/latest/ug/installing-amazon-efs-utils.html
7054
bash "install efs utils" do
7155
cwd node['cluster']['sources_dir']

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_redhat_based.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
1414
# See the License for the specific language governing permissions and limitations under the License.
1515

16-
def install_script_code(_efs_utils_tarball, efs_utils_package, efs_utils_version)
16+
def install_script_code(efs_utils_tarball, efs_utils_package, efs_utils_version)
1717
<<-EFSUTILSINSTALL
1818
set -e
19+
tar xf #{efs_utils_tarball}
1920
cd efs-utils-#{efs_utils_version}
2021
make rpm
2122
yum -y install ./build/#{efs_utils_package}*rpm

cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,10 @@ def mock_already_installed(package, expected_version, installed)
8888
cached(:tarball_path) { "#{source_dir}/efs-utils-#{utils_version}.tar.gz" }
8989
cached(:tarball_url) { "https://#{aws_region}-aws-parallelcluster.s3.#{aws_region}.test_aws_domain/archives/dependencies/efs/v#{utils_version}.tar.gz" }
9090
cached(:tarball_checksum) { 'TARBALL CHECKSUM' }
91-
cached(:bash_untar_code) do
92-
<<-EFSUTILSUNTAR
93-
set -e
94-
tar xf #{tarball_path}
95-
EFSUTILSUNTAR
96-
end
9791
cached(:bash_code) do
9892
<<-EFSUTILSINSTALL
9993
set -e
94+
tar xf #{tarball_path}
10095
cd efs-utils-#{utils_version}
10196
./build-deb.sh
10297
apt-get -y install ./build/amazon-efs-utils*deb
@@ -132,12 +127,6 @@ def mock_already_installed(package, expected_version, installed)
132127
.with(checksum: tarball_checksum)
133128
end
134129

135-
it 'it untars the downloaded tarball' do
136-
is_expected.to run_bash('Untar the efs-utils')
137-
.with(cwd: source_dir)
138-
.with(code: bash_untar_code)
139-
end
140-
141130
it 'installs package from downloaded tarball' do
142131
is_expected.to run_bash('install efs utils')
143132
.with(cwd: source_dir)
@@ -179,15 +168,10 @@ def mock_already_installed(package, expected_version, installed)
179168
cached(:tarball_path) { "#{source_dir}/efs-utils-#{utils_version}.tar.gz" }
180169
cached(:tarball_url) { "https://#{aws_region}-aws-parallelcluster.s3.#{aws_region}.test_aws_domain/archives/dependencies/efs/v#{utils_version}.tar.gz" }
181170
cached(:tarball_checksum) { 'TARBALL CHECKSUM' }
182-
cached(:bash_untar_code) do
183-
<<-EFSUTILSUNTAR
184-
set -e
185-
tar xf #{tarball_path}
186-
EFSUTILSUNTAR
187-
end
188171
cached(:bash_code) do
189172
<<-EFSUTILSINSTALL
190173
set -e
174+
tar xf #{tarball_path}
191175
cd efs-utils-#{utils_version}
192176
make rpm
193177
yum -y install ./build/amazon-efs-utils*rpm
@@ -234,12 +218,6 @@ def mock_already_installed(package, expected_version, installed)
234218
.with(checksum: tarball_checksum)
235219
end
236220

237-
it 'it untars the downloaded tarball' do
238-
is_expected.to run_bash('Untar the efs-utils')
239-
.with(cwd: source_dir)
240-
.with(code: bash_untar_code)
241-
end
242-
243221
it 'installs package from downloaded tarball' do
244222
is_expected.to run_bash('install efs utils')
245223
.with(cwd: source_dir)

0 commit comments

Comments
 (0)