Skip to content

Commit 227e07f

Browse files
committed
Remove integration with Jira release tool
1 parent 2674c1f commit 227e07f

File tree

4 files changed

+0
-39
lines changed

4 files changed

+0
-39
lines changed

cookiecutter.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"project_name": "My Project",
33
"project_slug": "{{ cookiecutter.project_name|lower|replace(' ', '_')|replace('-', '_') }}",
44
"__network_name": "{{ cookiecutter.project_slug|replace('_', '') }}",
5-
"jira_prefix": "",
65
"virtualization_tool": ["docker", "nothing"],
76
"override_user_model": "y",
87
"language_list": "de,en,fr,it",

{{cookiecutter.project_slug}}/docker-compose.override.example.yml

-8
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737
# &x-environment
3838
# ALLOWED_HOSTS: |-
3939
# {{ subdomain }}.docker.test
40-
# # These Jira variables allow the use of the "jira_release_helper" tool, which posts comments, closes stories
41-
# # automatically on deployment.
42-
# JIRA_USERNAME: username
43-
# JIRA_PASSWORD: password
44-
# JIRA_URL: https://jira.liip.ch
4540
#
4641
# x-build-args: &x-build-args
4742
# USER_ID: 1000 # Change this if your host user is not 1000
@@ -52,9 +47,6 @@
5247
# environment:
5348
# <<: *x-environment
5449
# SSH_AUTH_SOCK: /run/host-services/ssh-auth.sock
55-
# JIRA_USERNAME: username
56-
# JIRA_PASSWORD: password
57-
# JIRA_URL: https://jira.liip.ch
5850
#
5951
# ## To forward SSH agent to the container, read https://wiki.liip.ch/x/FyDVJw
6052
# ## and uncomment one of the following volumes:

{{cookiecutter.project_slug}}/fabfile.py

-29
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
local_project_root = os.path.dirname(__file__)
4141
project_name = "{{ cookiecutter.project_slug }}"
42-
jira_prefix = "{{ cookiecutter.jira_prefix }}"
4342

4443

4544
class MissingEnvVariable(Exception):
@@ -497,33 +496,6 @@ def import_db(c, dump_file=None, with_media=False):
497496
import_media(c)
498497

499498

500-
@task
501-
@remote
502-
def comment_and_close_on_jira(c):
503-
if c.config["environment"] == "prod":
504-
command = "comment_and_close_issues_to_deploy"
505-
else:
506-
command = "comment_after_deploy"
507-
508-
with c.conn.cd(c.conn.project_root):
509-
remote_version = c.conn.git("rev-parse last_master", hide=True).stdout.strip()
510-
new_version = subprocess.run(
511-
"git rev-parse HEAD".split(" "),
512-
text=True,
513-
capture_output=True,
514-
cwd=local_project_root,
515-
).stdout.strip()
516-
517-
subprocess.run(
518-
f"jira_release {command} "
519-
f"--jira-prefix={jira_prefix} "
520-
f"--environment={c.config.environment} "
521-
f"--remote-version={remote_version} "
522-
f"--to-deploy-version={new_version} "
523-
f"--git-path={local_project_root}".split(" ")
524-
)
525-
526-
527499
@remote
528500
def update_or_create_last_master(c):
529501
with c.conn.cd(c.conn.project_root):
@@ -573,7 +545,6 @@ def deploy(c, noconfirm=False):
573545
dj_migrate_database(c)
574546
reload_uwsgi(c)
575547
c.conn.clean_old_database_backups(nb_backups_to_keep=10)
576-
comment_and_close_on_jira(c)
577548
update_or_create_last_master(c)
578549

579550

{{cookiecutter.project_slug}}/requirements/dev.in

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ werkzeug
88
# Deployment requirements
99
fabric
1010
dulwich<=0.20.3
11-
git+https://github.com/liip/jira_release_helper.git@main

0 commit comments

Comments
 (0)