Skip to content

Commit

Permalink
Merge pull request ceph#38942 from smithfarm/wip-bci-pacific
Browse files Browse the repository at this point in the history
script: make backport scripts know about pacific

Reviewed-by: Patrick Donnelly <[email protected]>
Reviewed-by: Josh Durgin <[email protected]>
  • Loading branch information
smithfarm authored Jan 22, 2021
2 parents 3d7761b + 7221f64 commit 0029d52
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/script/backport-create-issue
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def connect_to_redmine(a):
def releases():
return ('argonaut', 'bobtail', 'cuttlefish', 'dumpling', 'emperor',
'firefly', 'giant', 'hammer', 'infernalis', 'jewel', 'kraken',
'luminous', 'mimic', 'nautilus', 'octopus')
'luminous', 'mimic', 'nautilus', 'octopus', 'pacific')

def populate_status_dict(r):
for status in r.issue_status.all():
Expand Down
5 changes: 3 additions & 2 deletions src/script/backport-resolve-issue
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def read_from_file(fs):
def releases():
return ('argonaut', 'bobtail', 'cuttlefish', 'dumpling', 'emperor',
'firefly', 'giant', 'hammer', 'infernalis', 'jewel', 'kraken',
'luminous', 'mimic', 'nautilus', 'octopus')
'luminous', 'mimic', 'nautilus', 'octopus', 'pacific')

def report_params(a):
global dry_run
Expand All @@ -351,7 +351,8 @@ def tag_sha1(repo, sha1):
def ver_to_release():
return {'v9.2': 'infernalis', 'v10.2': 'jewel', 'v11.2': 'kraken',
'v12.2': 'luminous', 'v13.2': 'mimic', 'v14.2': 'nautilus',
'v15.2': 'octopus'}
'v15.2': 'octopus', 'v16.0': 'pacific', 'v16.1': 'pacific',
'v16.2': 'pacific'}

def usage():
logging.error("Redmine credentials are required to perform this operation. "
Expand Down
2 changes: 1 addition & 1 deletion src/script/ceph-backport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ function try_known_milestones {
mimic) mn="11" ;;
nautilus) mn="12" ;;
octopus) mn="13" ;;
pacific) mn="TBD" ;;
pacific) mn="14" ;;
esac
echo "$mn"
}
Expand Down

0 comments on commit 0029d52

Please sign in to comment.