PR#5468: dist-git: Added a condition that decides whether to use the stg or prod version of the link - pagure

pagure

#5468 dist-git: Added a condition that decides whether to use the stg or prod version of the link

Merged 2 years ago by wombelix. Opened 2 years ago by amedvede.

amedvede/pagure pdc_drop into master

dist-git: Added a condition that decides whether to use the stg or prod version of the link

amedvede • 2 years ago

32ac00b

pagure/themes/srcfpo/templates/repo_branches.html

file modified

+22 -4

		`@@ -140,7 +140,15 @@`
		`function disable_branches() {`
		`function checkForDeadPackage(branch, namespace, repo_name) {`
		`return new Promise((resolve, reject) => {`
		- const branchUrl = `https://src.stg.fedoraproject.org/${namespace}/${repo_name}/blob/${branch}/f/dead.package`;
		`+ // Getting variable from config to find out type of link that should be used`
		`+ let appUrl = "{{ config['APP_URL'] }}"`
		`+`
		`+ let branchUrl;`
		`+ if (appUrl === "https://stg.pagure.io/") {`
		+ branchUrl = `https://src.stg.fedoraproject.org/${namespace}/${repo_name}/blob/${branch}/f/dead.package`;
		`+ } else {`
		+ branchUrl = `https://src.fedoraproject.org/${namespace}/${repo_name}/blob/${branch}/f/dead.package`;
		`+ }`
		`$.ajax({`
		`url: branchUrl,`
		`type: "HEAD",`
		`@@ -183,9 +191,19 @@`
		`}`

		`function getBranches() {`
		`- let request1 = fetchReleases('https://bodhi.stg.fedoraproject.org/list_releases/?state=current');`
		`- let request2 = fetchReleases('https://bodhi.stg.fedoraproject.org/list_releases/?state=pending');`
		`- let request3 = fetchReleases('https://bodhi.stg.fedoraproject.org/list_releases/?state=frozen')`
		`+ // Getting variable from config to find out type of link that should be used`
		`+ let appUrl = "{{ config['APP_URL'] }}"`
		`+`
		`+ let request1, request2, request3;`
		`+ if (appUrl === "https://stg.pagure.io/") {`
		`+ request1 = fetchReleases('https://bodhi.stg.fedoraproject.org/list_releases/?state=current');`
		`+ request2 = fetchReleases('https://bodhi.stg.fedoraproject.org/list_releases/?state=pending');`
		`+ request3 = fetchReleases('https://bodhi.stg.fedoraproject.org/list_releases/?state=frozen');`
		`+ } else {`
		`+ request1 = fetchReleases('https://bodhi.fedoraproject.org/list_releases/?state=current');`
		`+ request2 = fetchReleases('https://bodhi.fedoraproject.org/list_releases/?state=pending');`
		`+ request3 = fetchReleases('https://bodhi.fedoraproject.org/list_releases/?state=frozen');`
		`+ }`

		`return Promise.all([request1, request2, request3]).then(function (responses) {`
		`let currentReleases = responses[0].releases;`

amedvede commented 2 years ago

Signed-off-by: amedvede amedvede@redhat.com

1 new commit added

feat: added if statement to decide which env to use stg or prod

2 years ago

rebased onto e633c96cef7802a1536b71183aff550fae529bdd

2 years ago

rebased onto 47a381ea79144f8115dfd985f0a0cce09065fbfc

2 years ago

pretty please pagure-ci rebuild

2 years ago

rebased onto 32ac00b

2 years ago

pretty please pagure-ci rebuild

2 years ago

wombelix commented 2 years ago

I'm fine with the PR, tests fail on Py312 for unrelated reasons.

02:11:16  =========================== short test summary info ============================

02:11:16  FAILED tests/test_pagure_flask_ui_repo.py::PagureFlaskRepotests::test_renew_api_token - AssertionError: datetime.date(2024, 11, 11) != datetime.date(2024, 11, 12)

02:11:16  FAILED tests/test_pagure_flask_ui_repo.py::PagureFlaskRepotests::test_revoke_api_token - AssertionError: datetime.date(2024, 11, 11) != datetime.date(2024, 11, 12)

02:11:16  === 2 failed, 1663 passed, 3 skipped, 136148 warnings in 1284.46s (0:21:24) ====

02:11:17  py312: exit 1 (1285.91 seconds) /pagure> pytest -n auto tests/ pid=50469
02:11:17    py39: OK (1299.26=setup[37.29]+cmd[1261.97] seconds)
02:11:17    py310: OK (1307.16=setup[34.86]+cmd[1272.30] seconds)
02:11:17    py311: OK (1260.46=setup[36.16]+cmd[1224.30] seconds)
02:11:17    py312: FAIL code 1 (1375.65=setup[89.74]+cmd[1285.91] seconds)
02:11:17    evaluation failed :( (5242.60 seconds)

Metadata Update from @wombelix:
- Request assigned

2 years ago

Pull-Request has been merged by wombelix

2 years ago