jingrow/jcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新版本号

Browse Source
This commit is contained in:
jingrow 2025-04-20 09:35:07 +08:00
parent f422b2c1af
commit 9406e0de68
20 changed files with 168 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard/src/views/bench/BenchSites.vue
View File

@ -441,7 +441,7 @@ export default {
condition: () =>
this.versions[i].status === 'Active' &&
(Number(this.versions[i].version.split(' ')[1] > 13) ||
this.versions[i].version === 'Nightly') &&
this.versions[i].version === 'v0.1') &&
this.permissions.rebuildBench
},
{

4
dashboard/src/views/site/SiteVersionUpgradeDialog.vue
View File

@ -116,7 +116,7 @@ export default {
message() {
if (this.site.jingrow_version === this.site.latest_jingrow_version) {
return 'This site is already on the latest version.';
} else if (this.site.jingrow_version === 'Nightly') {
} else if (this.site.jingrow_version === 'v0.1') {
return "This site is on a nightly version and doesn't need to be upgraded.";
} else if (
!this.site.group_public &&
@ -180,7 +180,7 @@ export default {
this.site?.jingrow_version &&
this.site?.name &&
!this.site?.group_public &&
this.site?.jingrow_version !== 'Nightly',
this.site?.jingrow_version !== 'v0.1',
transform(data) {
return data.map(group => ({
label: group.title || group.name,

4
dashboard/src2/components/site/SiteVersionUpgradeDialog.vue
View File

@ -137,7 +137,7 @@ export default {
message() {
if (this.$site.pg?.version === this.$site.pg?.latest_jingrow_version) {
return '此站点已经是最新版本。';
} else if (this.$site.pg?.version === 'Nightly') {
} else if (this.$site.pg?.version === 'v0.1') {
return "此站点处于夜间版本，无需升级。";
} else if (
!this.$site.pg?.group_public &&
@ -199,7 +199,7 @@ export default {
auto:
this.$site.pg?.version &&
!this.$site.pg?.group_public &&
this.$site.pg?.version !== 'Nightly',
this.$site.pg?.version !== 'v0.1',
transform(data) {
return data.map(group => ({
label: group.title || group.name,

4
dashboard/src2/pages/NewSite.vue
View File

@ -546,8 +546,8 @@ export default {
if (this.selectedLocalisationCountry) {
// temporary override since we don't have localisation app ready for v14
// TODO: remove this when localisation app is ready for v14
commonVersions = ['Version 15'];
this.version = 'Version 15';
commonVersions = ['v1'];
this.version = 'v1';
}
return this.options.versions.map((v) => ({

2
dashboard/src2/pages/ReleaseGroupBenchSites.vue
View File

@ -357,7 +357,7 @@ condition: () => bench.status === 'Active' && bench.rows.length > 0,
condition: () =>
bench.status === 'Active' &&
(Number(this.$releaseGroup.pg.version.split(' ')[1]) > 13 ||
this.$releaseGroup.pg.version === 'Nightly'),
this.$releaseGroup.pg.version === 'v0.1'),
onClick: () => {
confirmDialog({
title: '重建资源',

2
jcloud/api/marketplace.py
View File

@ -362,7 +362,7 @@ def get_candidate_release_groups(marketplace_app: str, app_name: str) -> list[di
{
'name': 'bench-1096',
'title': 'My Private Bench',
'version': 'Version 13',
'version': 'v0.3',
'source': 'SRC-posawesome-001'
}
"""

2
jcloud/api/tests/test_bench.py
View File

@ -43,7 +43,7 @@ from jcloud.utils.test import foreground_enqueue_pg
class TestAPIBench(JingrowTestCase):
def setUp(self):
self.team = create_test_jcloud_admin_team()
self.version = "Version 15"
self.version = "v1"
self.app = create_test_app()
self.app_source = self.app.add_source(
self.version,

14
jcloud/api/tests/test_marketplace.py
View File

@ -82,7 +82,7 @@ class TestAPIMarketplace(unittest.TestCase):
def setUp(self):
self.app = create_test_app("jerp", "JERP")
self.team = create_test_jcloud_admin_team()
self.version = "Version 14"
self.version = "v0.4"
self.app_source = create_test_app_source(
version=self.version, app=self.app, team=self.team.name
)
@ -182,7 +182,7 @@ class TestAPIMarketplace(unittest.TestCase):
team=self.team.name,
sources=[{"version": self.version, "source": app_source.name}],
)
new_source = create_test_app_source(version="Nightly", app=app)
new_source = create_test_app_source(version="v0.1", app=app)
jingrow.set_user(self.team.user)
marketplace_app = add_app(source=new_source.name, app=app.name)
self.assertIsNotNone(jingrow.db.exists("Marketplace App", marketplace_app))
@ -296,7 +296,7 @@ class TestAPIMarketplace(unittest.TestCase):
app = {
"name": "email_delivery_service",
"title": "Email Delivery Service",
"version": "Version 14",
"version": "v0.4",
"repository_url": "http://git.jingrow.com:3000/jingrow/email_delivery_service",
"branch": "develop",
"github_installation_id": "",
@ -343,21 +343,21 @@ class TestAPIMarketplace(unittest.TestCase):
def test_change_branch(self):
old_branch = self.app_source.branch
change_branch(
self.marketplace_app.name, self.app_source.name, "Version 14", "develop"
self.marketplace_app.name, self.app_source.name, "v0.4", "develop"
)
self.app_source.reload()
self.assertNotEqual(old_branch, self.app_source.branch)
def test_add_version(self):
old_versions = len(self.marketplace_app.sources)
add_version(self.marketplace_app.name, "develop", "Nightly")
add_version(self.marketplace_app.name, "develop", "v0.1")
self.marketplace_app.reload()
self.assertEqual(old_versions + 1, len(self.marketplace_app.sources))
def test_remove_version(self):
old_versions = len(self.marketplace_app.sources)
add_version(self.marketplace_app.name, "develop", "Nightly")
remove_version(self.marketplace_app.name, "Nightly")
add_version(self.marketplace_app.name, "develop", "v0.1")
remove_version(self.marketplace_app.name, "v0.1")
self.marketplace_app.reload()
self.assertEqual(old_versions, len(self.marketplace_app.sources))

28
jcloud/api/tests/test_site.py
View File

@ -53,22 +53,22 @@ class TestAPISite(unittest.TestCase):
app = create_test_app()
group12 = create_test_release_group([app], public=True, jingrow_version="Version 12")
group13 = create_test_release_group([app], public=True, jingrow_version="Version 13")
group14 = create_test_release_group([app], public=True, jingrow_version="Version 14")
group12 = create_test_release_group([app], public=True, jingrow_version="v0.2")
group13 = create_test_release_group([app], public=True, jingrow_version="v0.3")
group14 = create_test_release_group([app], public=True, jingrow_version="v0.4")
server = create_test_server()
create_test_bench(group=group12, server=server.name)
create_test_bench(group=group13, server=server.name)
create_test_bench(group=group14, server=server.name)
jingrow.set_user(self.team.user)
private_group = create_test_release_group([app], public=False, jingrow_version="Version 14")
private_group = create_test_release_group([app], public=False, jingrow_version="v0.4")
create_test_bench(group=private_group, server=server.name)
options = get_new_site_options()
for version in options["versions"]:
if version["name"] == "Version 14":
if version["name"] == "v0.4":
self.assertEqual(version["group"]["name"], group14.name)
@patch.object(AgentJob, "enqueue_http_request", new=Mock())
@ -121,7 +121,7 @@ class TestAPISite(unittest.TestCase):
f1_server = create_test_server(cluster=cluster.name, proxy_server=n1_server.name)
group = create_test_release_group(
[jingrow_app, allowed_app, disallowed_app], public=True, jingrow_version="Version 15"
[jingrow_app, allowed_app, disallowed_app], public=True, jingrow_version="v1"
)
group.append(
"servers",
@ -163,7 +163,7 @@ class TestAPISite(unittest.TestCase):
n1_server = create_test_proxy_server(cluster=cluster.name, domain=root_domain.name)
f1_server = create_test_server(cluster=cluster.name, proxy_server=n1_server.name)
group = create_test_release_group([jingrow_app, another_app], public=True, jingrow_version="Version 15")
group = create_test_release_group([jingrow_app, another_app], public=True, jingrow_version="v1")
group.append(
"servers",
{
@ -203,7 +203,7 @@ class TestAPISite(unittest.TestCase):
n2_server = create_test_proxy_server(cluster=cluster.name, domain=root_domain.name)
f2_server = create_test_server(cluster=cluster.name, proxy_server=n2_server.name)
rg1 = create_test_release_group([jingrow_app], public=True, jingrow_version="Version 15")
rg1 = create_test_release_group([jingrow_app], public=True, jingrow_version="v1")
rg1.append(
"servers",
{
@ -213,7 +213,7 @@ class TestAPISite(unittest.TestCase):
rg1.save()
create_test_bench(group=rg1, server=f1_server.name)
rg2 = create_test_release_group([jingrow_app], public=True, jingrow_version="Version 15")
rg2 = create_test_release_group([jingrow_app], public=True, jingrow_version="v1")
rg2.append(
"servers",
{
@ -261,7 +261,7 @@ class TestAPISite(unittest.TestCase):
n2_server = create_test_proxy_server(cluster=cluster.name, domain=root_domain.name)
f2_server = create_test_server(cluster=cluster.name, proxy_server=n2_server.name)
rg1 = create_test_release_group([jingrow_app], public=True, jingrow_version="Version 15")
rg1 = create_test_release_group([jingrow_app], public=True, jingrow_version="v1")
rg1.append(
"servers",
{
@ -271,7 +271,7 @@ class TestAPISite(unittest.TestCase):
rg1.save()
rg1_bench = create_test_bench(group=rg1, server=f1_server.name)
rg2 = create_test_release_group([jingrow_app], public=True, jingrow_version="Version 15")
rg2 = create_test_release_group([jingrow_app], public=True, jingrow_version="v1")
rg2.append(
"servers",
{
@ -383,7 +383,7 @@ class TestAPISite(unittest.TestCase):
)
@patch.object(AgentJob, "enqueue_http_request", new=Mock())
def _setup_site_update(self):
version = "Version 13"
version = "v0.3"
app = create_test_app()
group = create_test_release_group([app], jingrow_version=version)
self.bench1 = create_test_bench(group=group)
@ -801,7 +801,7 @@ jerp 0.8.3 HEAD
app = create_test_app()
server = create_test_server()
v14_group = create_test_release_group([app], jingrow_version="Version 14")
v14_group = create_test_release_group([app], jingrow_version="v0.4")
v14_group.append(
"servers",
{
@ -810,7 +810,7 @@ jerp 0.8.3 HEAD
)
v14_group.save()
v15_group = create_test_release_group([app], jingrow_version="Version 15")
v15_group = create_test_release_group([app], jingrow_version="v1")
v15_group.append(
"servers",
{

4
jcloud/bootstrap.py
View File

@ -330,14 +330,14 @@ def setup_apps():
"repository_url": "http://git.jingrow.com:3000/jingrow/jingrow",
"public": True,
"team": "Administrator",
"versions": [{"version": "Nightly"}],
"versions": [{"version": "v0.1"}],
}
).insert()
jingrow.get_pg(
{
"pagetype": "Release Group",
"title": "Jingrow",
"version": "Nightly",
"version": "v0.1",
"team": "Administrator",
"apps": [{"app": app.name, "source": source.name}],
}

98
jcloud/fixtures/bench_dependency.json
View File

@ -11,7 +11,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "3.7"
},
{
@ -19,7 +19,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "3.7"
},
{
@ -27,7 +27,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "3.8"
},
{
@ -35,7 +35,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "3.10"
},
{
@ -43,7 +43,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "3.10"
},
{
@ -51,7 +51,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "3.10"
},
{
@ -59,7 +59,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "3.11"
},
{
@ -67,7 +67,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "3.11"
},
{
@ -75,7 +75,7 @@
"parent": "PYTHON_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "3.11"
}
],
@ -93,7 +93,7 @@
"parent": "NODE_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "18.16.0"
},
{
@ -101,7 +101,7 @@
"parent": "NODE_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "18.16.0"
},
{
@ -109,7 +109,7 @@
"parent": "NODE_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "16.11.0"
},
{
@ -117,7 +117,7 @@
"parent": "NODE_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "16.16.0"
},
{
@ -125,7 +125,7 @@
"parent": "NODE_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "14.19.0"
},
{
@ -133,7 +133,7 @@
"parent": "NODE_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "12.19.0"
}
],
@ -151,7 +151,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "0.12.4"
},
{
@ -159,7 +159,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "0.12.4"
},
{
@ -167,7 +167,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "0.12.4"
},
{
@ -175,7 +175,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "0.12.4"
},
{
@ -183,7 +183,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "0.12.4"
},
{
@ -191,7 +191,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "0.12.5"
},
{
@ -199,7 +199,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "0.12.5"
},
{
@ -207,7 +207,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "0.12.5"
},
{
@ -215,7 +215,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "0.12.5"
},
{
@ -223,7 +223,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "0.12.5"
},
{
@ -231,7 +231,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "0.12.6"
},
{
@ -239,7 +239,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "0.12.6"
},
{
@ -247,7 +247,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "0.12.6"
},
{
@ -255,7 +255,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "0.12.6"
},
{
@ -263,7 +263,7 @@
"parent": "WKHTMLTOPDF_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "0.12.6"
}
],
@ -281,7 +281,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "5.15.2"
},
{
@ -289,7 +289,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "5.15.2"
},
{
@ -297,7 +297,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "5.15.2"
},
{
@ -305,7 +305,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "5.16.0"
},
{
@ -313,7 +313,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "5.17.2"
},
{
@ -321,7 +321,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "5.17.2"
},
{
@ -329,7 +329,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "5.17.2"
},
{
@ -337,7 +337,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "5.17.2"
},
{
@ -345,7 +345,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "5.17.2"
},
{
@ -353,7 +353,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "5.18.0"
},
{
@ -361,7 +361,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "5.18.0"
},
{
@ -369,7 +369,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "5.18.0"
},
{
@ -377,7 +377,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "5.18.0"
},
{
@ -385,7 +385,7 @@
"parent": "BENCH_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "5.18.0"
}
],
@ -403,7 +403,7 @@
"parent": "NVM_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Nightly",
"supported_jingrow_version": "v0.1",
"version": "0.39.1"
},
{
@ -411,7 +411,7 @@
"parent": "NVM_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 12",
"supported_jingrow_version": "v0.2",
"version": "0.39.1"
},
{
@ -419,7 +419,7 @@
"parent": "NVM_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 13",
"supported_jingrow_version": "v0.3",
"version": "0.39.1"
},
{
@ -427,7 +427,7 @@
"parent": "NVM_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 14",
"supported_jingrow_version": "v0.4",
"version": "0.39.1"
},
{
@ -435,7 +435,7 @@
"parent": "NVM_VERSION",
"parentfield": "supported_versions",
"parenttype": "Bench Dependency",
"supported_jingrow_version": "Version 15",
"supported_jingrow_version": "v1",
"version": "0.39.1"
}
],

60
jcloud/fixtures/jingrow_version.json
View File

@ -4,35 +4,35 @@
"dependencies": [
{
"dependency": "NVM_VERSION",
"parent": "Version 12",
"parent": "v0.2",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.36.0"
},
{
"dependency": "NODE_VERSION",
"parent": "Version 12",
"parent": "v0.2",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "12.19.0"
},
{
"dependency": "PYTHON_VERSION",
"parent": "Version 12",
"parent": "v0.2",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "3.7"
},
{
"dependency": "WKHTMLTOPDF_VERSION",
"parent": "Version 12",
"parent": "v0.2",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.12.5"
},
{
"dependency": "BENCH_VERSION",
"parent": "Version 12",
"parent": "v0.2",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "5.15.2"
@ -41,7 +41,7 @@
"pagestatus": 0,
"pagetype": "Jingrow Version",
"modified": "2024-06-27 14:45:44.660933",
"name": "Version 12",
"name": "v0.2",
"number": 12,
"public": 0,
"status": "End of Life"
@ -51,35 +51,35 @@
"dependencies": [
{
"dependency": "NVM_VERSION",
"parent": "Version 13",
"parent": "v0.3",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.36.0"
},
{
"dependency": "NODE_VERSION",
"parent": "Version 13",
"parent": "v0.3",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "14.19.0"
},
{
"dependency": "PYTHON_VERSION",
"parent": "Version 13",
"parent": "v0.3",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "3.8"
},
{
"dependency": "WKHTMLTOPDF_VERSION",
"parent": "Version 13",
"parent": "v0.3",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.12.5"
},
{
"dependency": "BENCH_VERSION",
"parent": "Version 13",
"parent": "v0.3",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "5.15.2"
@ -88,7 +88,7 @@
"pagestatus": 0,
"pagetype": "Jingrow Version",
"modified": "2024-06-27 14:45:38.192207",
"name": "Version 13",
"name": "v0.3",
"number": 13,
"public": 1,
"status": "End of Life"
@ -98,35 +98,35 @@
"dependencies": [
{
"dependency": "NVM_VERSION",
"parent": "Nightly",
"parent": "v0.1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.36.0"
},
{
"dependency": "NODE_VERSION",
"parent": "Nightly",
"parent": "v0.1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "18.16.0"
},
{
"dependency": "PYTHON_VERSION",
"parent": "Nightly",
"parent": "v0.1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "3.11"
},
{
"dependency": "WKHTMLTOPDF_VERSION",
"parent": "Nightly",
"parent": "v0.1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.12.5"
},
{
"dependency": "BENCH_VERSION",
"parent": "Nightly",
"parent": "v0.1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "5.22.6"
@ -135,7 +135,7 @@
"pagestatus": 0,
"pagetype": "Jingrow Version",
"modified": "2023-07-21 19:46:37.813960",
"name": "Nightly",
"name": "v0.1",
"number": 15,
"public": 1,
"status": "Develop"
@ -145,35 +145,35 @@
"dependencies": [
{
"dependency": "NVM_VERSION",
"parent": "Version 14",
"parent": "v0.4",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.36.0"
},
{
"dependency": "NODE_VERSION",
"parent": "Version 14",
"parent": "v0.4",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "14.19.0"
},
{
"dependency": "PYTHON_VERSION",
"parent": "Version 14",
"parent": "v0.4",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "3.10"
},
{
"dependency": "WKHTMLTOPDF_VERSION",
"parent": "Version 14",
"parent": "v0.4",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.12.5"
},
{
"dependency": "BENCH_VERSION",
"parent": "Version 14",
"parent": "v0.4",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "5.15.2"
@ -182,7 +182,7 @@
"pagestatus": 0,
"pagetype": "Jingrow Version",
"modified": "2023-07-21 19:44:34.122005",
"name": "Version 14",
"name": "v0.4",
"number": 14,
"public": 1,
"status": "Stable"
@ -192,35 +192,35 @@
"dependencies": [
{
"dependency": "NVM_VERSION",
"parent": "Version 15",
"parent": "v1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.36.0"
},
{
"dependency": "NODE_VERSION",
"parent": "Version 15",
"parent": "v1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "18.16.0"
},
{
"dependency": "PYTHON_VERSION",
"parent": "Version 15",
"parent": "v1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "3.11"
},
{
"dependency": "WKHTMLTOPDF_VERSION",
"parent": "Version 15",
"parent": "v1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "0.12.5"
},
{
"dependency": "BENCH_VERSION",
"parent": "Version 15",
"parent": "v1",
"parentfield": "dependencies",
"parenttype": "Jingrow Version",
"version": "5.22.6"
@ -229,7 +229,7 @@
"pagestatus": 0,
"pagetype": "Jingrow Version",
"modified": "2023-07-19 17:31:05.044895",
"name": "Version 15",
"name": "v1",
"number": 15,
"public": 1,
"status": "Stable"

36
jcloud/jcloud/pagetype/app/test_app.py
View File

@ -29,7 +29,7 @@ class TestApp(unittest.TestCase):
self.assertEqual(app.jingrow, True)
source = app.add_source(
"Version 12",
"v0.2",
"http://git.jingrow.com:3000/jingrow/jingrow",
"version-12",
create_test_team().name,
@ -38,14 +38,14 @@ class TestApp(unittest.TestCase):
self.assertEqual(source.repository_owner, "jingrow")
self.assertEqual(len(source.versions), 1)
self.assertEqual(source.versions[0].version, "Version 12")
self.assertEqual(source.versions[0].version, "v0.2")
def test_create_non_jingrow_app(self):
app = create_test_app("jerp", "JERP")
self.assertEqual(app.jingrow, False)
source = app.add_source(
"Version 12",
"v0.2",
"http://git.jingrow.com:3000/jingrow/jerp",
"version-12",
create_test_team().name,
@ -54,47 +54,47 @@ class TestApp(unittest.TestCase):
self.assertEqual(source.repository_owner, "jingrow")
self.assertEqual(len(source.versions), 1)
self.assertEqual(source.versions[0].version, "Version 12")
self.assertEqual(source.versions[0].version, "v0.2")
def test_create_app_with_multiple_sources(self):
app = create_test_app("jingrow", "Jingrow Framework")
source_1 = app.add_source(
"Version 12",
"v0.2",
"http://git.jingrow.com:3000/jingrow/jingrow",
"version-12",
create_test_team().name,
)
source_2 = app.add_source(
"Version 13",
"v0.3",
"http://git.jingrow.com:3000/jingrow/jingrow",
"version-13",
create_test_team().name,
)
self.assertEqual(source_1.branch, "version-12")
self.assertEqual(len(source_1.versions), 1)
self.assertEqual(source_1.versions[0].version, "Version 12")
self.assertEqual(source_1.versions[0].version, "v0.2")
self.assertEqual(source_2.branch, "version-13")
self.assertEqual(len(source_2.versions), 1)
self.assertEqual(source_2.versions[0].version, "Version 13")
self.assertEqual(source_2.versions[0].version, "v0.3")
def test_create_app_with_one_source_multiple_versions(self):
app = create_test_app("jerp_documentation", "JERP Documentation")
team_name = create_test_team().name
source_1 = app.add_source(
"Version 12",
"v0.2",
"http://git.jingrow.com:3000/jingrow/jerp_documentation",
"master",
team_name,
)
self.assertEqual(source_1.branch, "master")
self.assertEqual(len(source_1.versions), 1)
self.assertEqual(source_1.versions[0].version, "Version 12")
self.assertEqual(source_1.versions[0].version, "v0.2")
source_2 = app.add_source(
"Version 13",
"v0.3",
"http://git.jingrow.com:3000/jingrow/jerp_documentation",
"master",
team_name,
@ -102,31 +102,31 @@ class TestApp(unittest.TestCase):
self.assertEqual(source_1.name, source_2.name)
self.assertEqual(len(source_2.versions), 2)
self.assertEqual(source_2.versions[0].version, "Version 12")
self.assertEqual(source_2.versions[1].version, "Version 13")
self.assertEqual(source_2.versions[0].version, "v0.2")
self.assertEqual(source_2.versions[1].version, "v0.3")
def test_create_app_add_second_source_after_insert(self):
app = create_test_app("jingrow", "Jingrow Framework")
source_1 = app.add_source(
"Version 12",
"v0.2",
"http://git.jingrow.com:3000/jingrow/jingrow",
"version-12",
create_test_team().name,
)
self.assertEqual(source_1.branch, "version-12")
self.assertEqual(len(source_1.versions), 1)
self.assertEqual(source_1.versions[0].version, "Version 12")
self.assertEqual(source_1.versions[0].version, "v0.2")
source_2 = app.add_source(
"Version 13",
"v0.3",
"http://git.jingrow.com:3000/jingrow/jingrow",
"version-13",
create_test_team().name,
)
self.assertEqual(source_1.branch, "version-12")
self.assertEqual(len(source_1.versions), 1)
self.assertEqual(source_1.versions[0].version, "Version 12")
self.assertEqual(source_1.versions[0].version, "v0.2")
self.assertEqual(source_2.branch, "version-13")
self.assertEqual(len(source_2.versions), 1)
self.assertEqual(source_2.versions[0].version, "Version 13")
self.assertEqual(source_2.versions[0].version, "v0.3")

10
jcloud/jcloud/pagetype/deploy_candidate/test_deploy_candidate.py
View File

@ -105,7 +105,7 @@ class TestDeployCandidate(unittest.TestCase):
Test if first deploy creates Deploy Candidate pg
"""
app = create_test_app()
source = create_test_app_source("Nightly", app)
source = create_test_app_source("v0.1", app)
create_test_app_release(source)
group = create_test_release_group([app])
candidate = group.create_deploy_candidate()
@ -286,7 +286,7 @@ def create_cache_test_release_group(
title = f"Test App Cache RG {random.getrandbits(20):x}"
pg_dict = {
"pagetype": "Release Group",
"version": "Nightly",
"version": "v0.1",
"enabled": True,
"title": title,
"team": team,
@ -318,21 +318,21 @@ def create_cache_test_apps(team: "Team") -> dict[str, "AppInfo"]:
(
"http://git.jingrow.com:3000/jingrow/jingrow",
"Jingrow Framework",
"Nightly",
"v0.1",
"develop",
"d26c67df75a95ef43d329eadd48d7998ea656856",
),
(
"http://git.jingrow.com:3000/jingrow/wiki",
"Jingrow Wiki",
"Nightly",
"v0.1",
"master",
"8b369c63dd90b4f36195844d4a84e2aaa3b8f39a",
),
(
"https://github.com/The-Commit-Company/raven",
"Raven",
"Nightly",
"v0.1",
"develop",
"317de412bc4b66c21052a929021c1013bbe31335",
),

6
jcloud/jcloud/pagetype/release_group/release_group.py
View File

@ -1356,13 +1356,13 @@ class ReleaseGroup(Document, TagHelpers):
def setup_default_feature_flags(self):
DEFAULT_FEATURE_FLAGS = {
"Version 14": {"merge_default_and_short_rq_queues": True},
"Version 15": {
"v0.4": {"merge_default_and_short_rq_queues": True},
"v1": {
"gunicorn_threads_per_worker": "4",
"merge_default_and_short_rq_queues": True,
"use_rq_workerpool": True,
},
"Nightly": {
"v0.1": {
"gunicorn_threads_per_worker": "4",
"merge_default_and_short_rq_queues": True,
"use_rq_workerpool": True,

40
jcloud/jcloud/pagetype/release_group/test_release_group.py
View File

@ -27,7 +27,7 @@ def create_test_release_group(
apps: list[App],
user: str = None,
public=False,
jingrow_version="Version 14",
jingrow_version="v0.4",
servers: list[str] = None,
) -> ReleaseGroup:
"""
@ -70,11 +70,11 @@ class TestReleaseGroup(unittest.TestCase):
def test_create_release_group(self):
app = create_test_app("jingrow", "Jingrow Framework")
source = app.add_source(
"Version 12", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
"v0.2", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
)
group = new_release_group(
"Test Group",
"Version 12",
"v0.2",
[{"app": source.app, "source": source.name}],
team=self.team,
)
@ -83,15 +83,15 @@ class TestReleaseGroup(unittest.TestCase):
def test_create_release_group_set_app_from_source(self):
app1 = create_test_app("jingrow", "Jingrow Framework")
source1 = app1.add_source(
"Version 12", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
"v0.2", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
)
app2 = create_test_app("jerp", "JERP")
source2 = app2.add_source(
"Version 12", "http://git.jingrow.com:3000/jingrow/jerp", "version-12", team=self.team
"v0.2", "http://git.jingrow.com:3000/jingrow/jerp", "version-12", team=self.team
)
group = new_release_group(
"Test Group",
"Version 12",
"v0.2",
[{"app": source2.app, "source": source1.name}],
team=self.team,
)
@ -100,13 +100,13 @@ class TestReleaseGroup(unittest.TestCase):
def test_create_release_group_fail_when_first_app_is_not_jingrow(self):
app = create_test_app("jerp", "JERP")
source = app.add_source(
"Version 12", "http://git.jingrow.com:3000/jingrow/jerp", "version-12", team=self.team
"v0.2", "http://git.jingrow.com:3000/jingrow/jerp", "version-12", team=self.team
)
self.assertRaises(
jingrow.ValidationError,
new_release_group,
"Test Group",
"Version 12",
"v0.2",
[{"app": source.app, "source": source.name}],
team=self.team,
)
@ -114,13 +114,13 @@ class TestReleaseGroup(unittest.TestCase):
def test_create_release_group_fail_when_duplicate_apps(self):
app = create_test_app("jingrow", "Jingrow Framework")
source = app.add_source(
"Version 12", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
"v0.2", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
)
self.assertRaises(
jingrow.ValidationError,
new_release_group,
"Test Group",
"Version 12",
"v0.2",
[
{"app": source.app, "source": source.name},
{"app": source.app, "source": source.name},
@ -131,13 +131,13 @@ class TestReleaseGroup(unittest.TestCase):
def test_create_release_group_fail_when_version_mismatch(self):
app = create_test_app("jingrow", "Jingrow Framework")
source = app.add_source(
"Version 12", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
"v0.2", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
)
self.assertRaises(
jingrow.ValidationError,
new_release_group,
"Test Group",
"Version 13",
"v0.3",
[{"app": source.app, "source": source.name}],
team=self.team,
)
@ -145,11 +145,11 @@ class TestReleaseGroup(unittest.TestCase):
def test_create_release_group_fail_with_duplicate_titles(self):
app = create_test_app("jingrow", "Jingrow Framework")
source = app.add_source(
"Version 12", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
"v0.2", "http://git.jingrow.com:3000/jingrow/jingrow", "version-12", team=self.team
)
new_release_group(
"Test Group",
"Version 12",
"v0.2",
[{"app": source.app, "source": source.name}],
team=self.team,
)
@ -157,7 +157,7 @@ class TestReleaseGroup(unittest.TestCase):
jingrow.ValidationError,
new_release_group,
"Test Group",
"Version 12",
"v0.2",
[{"app": source.app, "source": source.name}],
team=self.team,
)
@ -204,14 +204,14 @@ class TestReleaseGroup(unittest.TestCase):
def test_new_release_group_loaded_with_correct_dependencies(self):
app = create_test_app("jingrow", "Jingrow Framework")
jingrow_version = jingrow.get_pg("Jingrow Version", "Version 14")
jingrow_version = jingrow.get_pg("Jingrow Version", "v0.4")
group = jingrow.get_pg(
{
"pagetype": "Release Group",
"title": "Test Group",
"version": "Version 14",
"version": "v0.4",
"apps": [
{"app": app.name, "source": create_test_app_source("Version 14", app).name}
{"app": app.name, "source": create_test_app_source("v0.4", app).name}
],
"team": self.team,
}
@ -360,7 +360,7 @@ class TestReleaseGroup(unittest.TestCase):
jingrow.db.set_single_value("Jcloud Settings", "domain", root_domain.name)
jingrow_app = create_test_app(name="jingrow")
new_jingrow_app_source = create_test_app_source(version="Version 15", app=jingrow_app)
new_jingrow_app_source = create_test_app_source(version="v1", app=jingrow_app)
n1_server = create_test_proxy_server(cluster=cluster.name, domain=root_domain.name)
f1_server = create_test_server(cluster=cluster.name, proxy_server=n1_server.name)
@ -386,7 +386,7 @@ class TestReleaseGroup(unittest.TestCase):
{
"title": "Test Bench 55",
"apps": [{"name": jingrow_app.name, "source": new_jingrow_app_source.name}],
"version": "Version 15",
"version": "v1",
"cluster": "Default",
"saas_app": None,
"server": None,

6
jcloud/jcloud/pagetype/self_hosted_server/self_hosted_server.py
View File

@ -187,9 +187,9 @@ class SelfHostedServer(Document):
def map_branch_to_version(self, branch):
versions = {
"version-13": "Version 13",
"version-14": "Version 14",
"develop": "Nightly",
"version-13": "v0.3",
"version-14": "v0.4",
"develop": "v0.1",
}
return versions[branch]

4
jcloud/jcloud/pagetype/site_update/test_site_update.py
View File

@ -38,7 +38,7 @@ class TestSiteUpdate(JingrowTestCase):
@patch.object(AgentJob, "enqueue_http_request", new=Mock())
def test_update_of_v12_site_skips_search_index(self):
version = "Version 12"
version = "v0.2"
app = create_test_app()
app_source = create_test_app_source(version=version, app=app)
group = create_test_release_group([app], jingrow_version=version)
@ -61,7 +61,7 @@ class TestSiteUpdate(JingrowTestCase):
@patch.object(AgentJob, "enqueue_http_request", new=Mock())
def test_update_of_non_v12_site_doesnt_skip_search_index(self):
version = "Version 13"
version = "v0.3"
app = create_test_app()
app_source = create_test_app_source(version=version, app=app)
group = create_test_release_group([app], jingrow_version=version)

8
jcloud/jcloud/pagetype/version_upgrade/version_upgrade.py
View File

@ -71,14 +71,14 @@ class VersionUpgrade(Document):
def validate_versions(self):
source_version = jingrow.get_value("Release Group", self.source_group, "version")
dest_version = jingrow.get_value("Release Group", self.destination_group, "version")
if dest_version == "Nightly":
if dest_version == "v0.1":
jingrow.msgprint(
"You are upgrading the site to Nightly Branch. Please note that Nightly might not be stable"
"You are upgrading the site to v0.1 Branch. Please note that v0.1 might not be stable"
)
return
if source_version == "Nightly":
if source_version == "v0.1":
jingrow.throw(
f"Downgrading from Nightly to {dest_version.title()} is not allowed",
f"Downgrading from v0.1 to {dest_version.title()} is not allowed",
jingrow.ValidationError,
)
source = int(source_version.split()[1])

2
jcloud/marketplace/pagetype/marketplace_app_plan/test_marketplace_app_plan.py
View File

@ -24,7 +24,7 @@ def create_test_marketplace_app_plan(app: str = "jingrow"):
"price_cny": 1000,
"price_usd": 12,
"app": app,
"versions": [{"version": "Version 14"}],
"versions": [{"version": "v0.4"}],
"features": [{"description": "Feature 1"}],
"enabled": 1,
}