Skip to content

Commit 2342067

Browse files
committed
Adjust release-creation scripts to refer to uktena repo for python distribution creation
1 parent d7556a3 commit 2342067

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

release_scripts/Jenkinsfile_branches

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ pipeline {
7575
defaultValue: true
7676
),
7777
booleanParam(
78-
name: "GENIE_PYTHON",
79-
description: "Create release branch for Genie Python.",
78+
name: "UKTENA",
79+
description: "Create release branch for Uktena Python distribution.",
8080
defaultValue: true
8181
),
8282
booleanParam(
@@ -106,8 +106,8 @@ pipeline {
106106
build job: "EPICS_release", propagate: false, wait: false
107107
build job: "EPICS_release32", propagate: false, wait: false
108108
}
109-
if (params.GENIE_PYTHON) {
110-
build job: "genie_python_release_pipeline", propagate: false, wait: false
109+
if (params.UKTENA) {
110+
build job: "uktena_release_pipeline", propagate: false, wait: false
111111
}
112112
if (params.IBEX_GUI) {
113113
build job: "ibex_gui_releases_pipeline", propagate: false, wait: false

release_scripts/branches.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
EPICS_REPO_URL = "https://github.com/ISISComputingGroup/EPICS.git"
1313
IBEX_REPO_URL = "https://github.com/ISISComputingGroup/ibex_gui.git"
14-
GENIE_PYTHON_URL = "https://github.com/ISISComputingGroup/genie_python.git"
14+
UKTENA_URL = "https://github.com/ISISComputingGroup/uktena.git"
1515
JSON_BOURNE_URL = "https://github.com/ISISComputingGroup/JSON_bourne.git"
1616

1717
EPICS_DIR = "EPICS"
1818
IBEX_DIR = "IBEX"
1919
SCRIPT_GEN_DIR = "SCRIPT_GEN"
20-
GENIE_PYTHON_DIR = "genie_python"
20+
UKTENA_DIR = "uktena"
2121
JSON_BOURNE_DIR = "JSON_bourne"
2222

2323
INSTETC_TEMPLATE_LOCAL_PATH = os.path.join(
@@ -45,9 +45,6 @@
4545
)
4646
SCRIPT_GENERATOR_POM_ABSOLUTE_PATH = os.path.join(SCRIPT_GEN_DIR, SCRIPT_GENERATOR_POM_LOCAL_PATH)
4747

48-
GENIE_PYTHON_VERSION_LOCAL_PATH = os.path.join("Lib", "site-packages", "genie_python", "version.py")
49-
GENIE_PYTHON_VERSION_ABSOLUTE_PATH = os.path.join(GENIE_PYTHON_DIR, GENIE_PYTHON_VERSION_LOCAL_PATH)
50-
5148

5249
def write_instetc_version(version: str):
5350
logging.info(f"Writing version '{version}' to '{INSTETC_TEMPLATE_ABSOLUTE_PATH}'.")
@@ -97,13 +94,6 @@ def write_gui_version(manifest_path: str, pom_path: str, version: str):
9794
tree.write(pom_path)
9895

9996

100-
def write_genie_python_version(version: str):
101-
logging.info(f"Writing version '{version}' to '{GENIE_PYTHON_VERSION_ABSOLUTE_PATH}'.")
102-
103-
with open(GENIE_PYTHON_VERSION_ABSOLUTE_PATH, "w") as file:
104-
file.write(f'VERSION = "{version}"\n')
105-
106-
10797
class ReleaseBranch:
10898
"""Wrapper around a Repo object. Used to perform Git operations on a release branch."""
10999

@@ -267,12 +257,10 @@ def push(self, submodules: bool = False):
267257
)
268258
script_gen.push()
269259

270-
if os.getenv("GENIE_PYTHON") == "true":
271-
genie_python = ReleaseBranch()
272-
genie_python.create(GENIE_PYTHON_URL, GENIE_PYTHON_DIR, f"Release_{args.version}")
273-
write_genie_python_version(args.version)
274-
genie_python.commit([GENIE_PYTHON_VERSION_LOCAL_PATH], f"Update version to {args.version}.")
275-
genie_python.push()
260+
if os.getenv("UKTENA") == "true":
261+
uktena = ReleaseBranch()
262+
uktena.create(UKTENA_URL, UKTENA_DIR, f"Release_{args.version}")
263+
uktena.push()
276264

277265
if os.getenv("JSON_BOURNE") == "true":
278266
json_bourne = ReleaseBranch()

0 commit comments

Comments
 (0)