Skip to content

Commit 4010b88

Browse files
authored
test: add release info to xml file before uploading to obj storage (#553)
1 parent a36715d commit 4010b88

File tree

2 files changed

+32
-6
lines changed

2 files changed

+32
-6
lines changed

.github/workflows/e2e-suite.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,11 @@ jobs:
4747
env:
4848
LINODE_CLI_TOKEN: ${{ secrets.LINODE_TOKEN }}
4949

50-
- name: Set release version env
51-
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
52-
5350
- name: Add additional information to XML report
5451
run: |
55-
echo $RELEASE_VERSION
56-
echo ${{ env.RELEASE_VERSION }}
5752
filename=$(ls | grep -E '^[0-9]{12}_cli_test_report\.xml$')
5853
python scripts/add_to_xml_test_report.py \
59-
--branch_name "${{ env.RELEASE_VERSION }}" \
54+
--branch_name "${GITHUB_REF#refs/*/}" \
6055
--gha_run_id "$GITHUB_RUN_ID" \
6156
--gha_run_number "$GITHUB_RUN_NUMBER" \
6257
--xmlfile "${filename}"

scripts/add_to_xml_test_report.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,38 @@
11
import argparse
22
import xml.etree.ElementTree as ET
3+
import requests
4+
5+
latest_release_url = "https://api.github.com/repos/linode/linode-cli/releases/latest"
6+
7+
8+
def get_release_version():
9+
url = latest_release_url
10+
11+
try:
12+
response = requests.get(url)
13+
response.raise_for_status() # Check for HTTP errors
14+
15+
release_info = response.json()
16+
version = release_info["tag_name"]
17+
18+
# Remove 'v' prefix if it exists
19+
if version.startswith("v"):
20+
version = version[1:]
21+
22+
return str(version)
23+
24+
except requests.exceptions.RequestException as e:
25+
print("Error:", e)
26+
except KeyError:
27+
print("Error: Unable to fetch release information from GitHub API.")
28+
329

430
# Parse command-line arguments
531
parser = argparse.ArgumentParser(description='Modify XML with workflow information')
632
parser.add_argument('--branch_name', required=True)
733
parser.add_argument('--gha_run_id', required=True)
834
parser.add_argument('--gha_run_number', required=True)
35+
parser.add_argument('--release_tag', required=False)
936
parser.add_argument('--xmlfile', required=True) # Added argument for XML file path
1037

1138
args = parser.parse_args()
@@ -25,10 +52,14 @@
2552
gha_run_number_element = ET.Element('gha_run_number')
2653
gha_run_number_element.text = args.gha_run_number
2754

55+
gha_release_tag_element = ET.Element('release_tag')
56+
gha_release_tag_element.text = get_release_version()
57+
2858
# Add the new elements to the root of the XML
2959
root.append(branch_name_element)
3060
root.append(gha_run_id_element)
3161
root.append(gha_run_number_element)
62+
root.append(gha_release_tag_element)
3263

3364
# Save the modified XML
3465
modified_xml_file_path = xml_file_path # Overwrite it

0 commit comments

Comments
 (0)