Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: aproxy arm/amd revision fix #204

Merged
merged 4 commits into from
Jan 23, 2024
Merged

fix: aproxy arm/amd revision fix #204

merged 4 commits into from
Jan 23, 2024

Conversation

yanksyoon
Copy link
Collaborator

@yanksyoon yanksyoon commented Jan 22, 2024

Applicable spec: N/A

Overview

The revisions of aproxy are separate for each ARM and X84 architectures due to how snap store works.
Separate the two revisions.

Link to successful run: https://github.com/yanksyoon/selfhostedtest/actions/runs/7607632472/job/20717460214

Rationale

Just tested on ARM deployment, the current revision is fixed to 6, which is broken.

unit-github-runner-1: 15:51:47 INFO unit.github-runner/1.juju-log Executing command ['/snap/bin/lxc', 'exec', 'github-runner-1-6c3518b8ba2435e2cba2c6d9', '--', 'snap', 'install', 'aproxy', '--channel=edge', '--revision=6']
unit-github-runner-1: 15:51:48 ERROR unit.github-runner/1.juju-log Unable to install aproxy due to error: cannot install "aproxy": snap "aproxy" supported architectures (amd64)
       are incompatible with this system (arm64)

Juju Events Changes

None.

Module Changes

runner.py now contains revision number constants for different aproxy architectures.

Library Changes

None.

Checklist

Copy link
Contributor

Test coverage for 3ad0e74

Name                         Stmts   Miss Branch BrPart  Cover   Missing
------------------------------------------------------------------------
src/charm.py                   459    111    117     26    73%   86-88, 112-113, 117-119, 157-159, 169->181, 179, 214-233, 242-243, 257-259, 260->272, 263->272, 296-300, 331, 411-416, 439, 456-457, 466-489, 509-514, 520-523, 530, 533-534, 550, 554-559, 604->607, 620-621, 623-624, 658-665, 689-690, 702-704, 719-720, 748-749, 751-752, 754-755, 829->831, 892-893, 909, 927-929, 933-935, 939
src/charm_state.py             136     18     18      3    85%   131-138, 220-221, 260-262, 273-274, 280-285, 296-298
src/errors.py                   39      0      0      0   100%
src/event_timer.py              45      9      6      1    73%   80, 100-103, 123-126
src/firewall.py                 43     25     10      0    38%   38-42, 64-67, 75-149
src/github_client.py            68      6     32      3    87%   124, 146, 158-165, 183->216
src/github_metrics.py           14      0      0      0   100%
src/github_type.py              50      0      0      0   100%
src/lxd_type.py                 37      0      2      0   100%
src/metrics.py                  73      2     10      1    96%   61->64, 170-171
src/metrics_type.py              6      0      0      0   100%
src/runner.py                  322     70     96     24    73%   44->46, 128, 255-256, 297-306, 330-335, 340, 360, 364-374, 423->426, 429-431, 438, 452, 462, 466, 468, 483, 517-522, 538-551, 562-601, 606, 644, 691-693, 697, 715, 750, 776, 781-793, 807, 812->814, 817-819
src/runner_logs.py              35      2      6      1    93%   62->61, 66-67
src/runner_manager.py          274     47     90      8    82%   122, 167-169, 182-183, 195-197, 203-208, 212-213, 223-224, 243, 286-287, 331-333, 398, 418-422, 447, 499-502, 538, 645-658, 668, 673-684
src/runner_manager_type.py      33      0      6      0   100%
src/runner_metrics.py          123      8     20      2    93%   147-148, 160, 191-192, 307-311
src/runner_type.py              47      0     10      0   100%
src/shared_fs.py               116     16     20      0    88%   108-109, 133-134, 217-218, 241-242, 254-255, 260-261, 267-268, 292-293
src/utilities.py                68      5     20      7    86%   74->76, 78->84, 91, 121, 135, 173, 226
------------------------------------------------------------------------
TOTAL                         1988    319    463     76    81%

Static code analysis report

Run started:2024-01-22 14:44:34.180917

Test results:
  No issues identified.

Code scanned:
  Total lines of code: 4342
  Total lines skipped (#nosec): 0
  Total potential issues skipped due to specifically being disabled (e.g., #nosec BXXX): 12

Run metrics:
  Total issues (by severity):
  	Undefined: 0
  	Low: 0
  	Medium: 0
  	High: 0
  Total issues (by confidence):
  	Undefined: 0
  	Low: 0
  	Medium: 0
  	High: 0
Files skipped (0):

@yanksyoon yanksyoon merged commit 7e73a46 into main Jan 23, 2024
57 checks passed
@yanksyoon yanksyoon deleted the fix/arm_aproxy_snap_rev branch January 23, 2024 00:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants