Skip to content

Bump version to 3.6.0b1 and fix version bump script #2027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 20, 2023
Merged

Bump version to 3.6.0b1 and fix version bump script #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b9f2b6
Fix version bump script
Apr 20, 2023
52d3aa1
Bump version to 3.6.0b1
Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cookbooks/aws-parallelcluster-common/attributes/common.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
default['cluster']['cfn_bootstrap']['package'] = "aws-cfn-bootstrap-py3-#{node['cluster']['cfn_bootstrap']['version']}.tar.gz"

# Python packages
default['cluster']['parallelcluster-version'] = '3.6.0'
default['cluster']['parallelcluster-cookbook-version'] = '3.6.0'
default['cluster']['parallelcluster-node-version'] = '3.6.0'
default['cluster']['parallelcluster-version'] = '3.6.0b1'
default['cluster']['parallelcluster-cookbook-version'] = '3.6.0b1'
default['cluster']['parallelcluster-node-version'] = '3.6.0b1'
default['cluster']['parallelcluster-awsbatch-cli-version'] = '1.1.0'
2 changes: 1 addition & 1 deletion kitchen.ec2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%
pcluster_version = ENV['KITCHEN_PCLUSTER_VERSION'] || '3.6.0'
pcluster_version = ENV['KITCHEN_PCLUSTER_VERSION'] || '3.6.0b1'
pcluster_prefix = "aws-parallelcluster-#{pcluster_version}"
%>
---
Expand Down
2 changes: 1 addition & 1 deletion system_tests/systemd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ mkdir -p /home/ubuntu/.ssh
chown -R ubuntu:ubuntu /home/ubuntu/.ssh

mkdir -p /opt/parallelcluster
echo "aws-parallelcluster-cookbook-3.6.0" > /opt/parallelcluster/.bootstrapped
echo "aws-parallelcluster-cookbook-3.6.0b1" > /opt/parallelcluster/.bootstrapped

mkdir -p /opt/parallelcluster/scripts
mkdir -p /etc/parallelcluster
Expand Down
3 changes: 2 additions & 1 deletion util/bump-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ FILES=("cookbooks/aws-parallelcluster-common/metadata.rb" "cookbooks/aws-paralle
sed -i "s/version '${CURRENT_PCLUSTER_VERSION_SHORT}'/version '${NEW_PCLUSTER_VERSION_SHORT}'/g" ${FILES[*]}

# Update dependencies version in specific(install, config, ecc...) cookbook metadata
FILES=("cookbooks/aws-parallelcluster-awsbatch/metadata.rb" "cookbooks/aws-parallelcluster-config/metadata.rb" "cookbooks/aws-parallelcluster-install/metadata.rb" "cookbooks/aws-parallelcluster-scheduler-plugin/metadata.rb" "cookbooks/aws-parallelcluster-slurm/metadata.rb" "cookbooks/aws-parallelcluster-test/metadata.rb")
FILES=("cookbooks/aws-parallelcluster-common/metadata.rb" "cookbooks/aws-parallelcluster-awsbatch/metadata.rb" "cookbooks/aws-parallelcluster-config/metadata.rb" "cookbooks/aws-parallelcluster-install/metadata.rb" "cookbooks/aws-parallelcluster-scheduler-plugin/metadata.rb" "cookbooks/aws-parallelcluster-slurm/metadata.rb" "cookbooks/aws-parallelcluster-test/metadata.rb")
sed -i "s/depends 'aws-parallelcluster-common', '~> ${CURRENT_PCLUSTER_VERSION_SHORT}'/depends 'aws-parallelcluster-common', '~> ${NEW_PCLUSTER_VERSION_SHORT}'/g" ${FILES[*]}
sed -i "s/depends 'aws-parallelcluster-test', '~> ${CURRENT_PCLUSTER_VERSION_SHORT}'/depends 'aws-parallelcluster-test', '~> ${NEW_PCLUSTER_VERSION_SHORT}'/g" ${FILES[*]}

CURRENT_AWSBATCH_CLI_VERSION=$(sed -ne "s/^default\['cluster'\]\['parallelcluster-awsbatch-cli-version'\] = '\(.*\)'/\1/p" cookbooks/aws-parallelcluster-common/attributes/common.rb)

Expand Down