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.

Sign up for GitHub

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

Nipa fixes #1062

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Nipa fixes #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de34045
(jobs.yaml): Add safeguards to submit to NIPA
nuclearcat Feb 28, 2025
0824019
(nipa-update.jinja2): Copy remote directory, so we dont overwrite res…
nuclearcat Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,3 +2011,6 @@ jobs:
kind: test
image: kernelci/{image_prefix}kernelci
kcidb_test_suite: kernelci_nipa-update
rules:
tree:
- netdev-testing
28 changes: 19 additions & 9 deletions config/runtime/nipa-update.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,6 @@ class Job(BaseJob):
subprocess.run(["git", "pull"], cwd=nipa_path)
# chdir to the nipa_path
os.chdir(nipa_path)
# run the nipa-update
args = ["/tmp/kernelci-nipa/nipa-results", "--id", parent_job]
# if api_name is not production, add --staging
if self._api_name != "production":
args.append("--staging")
r = subprocess.run(args, cwd=nipa_path)
if r.returncode != 0:
raise Exception(f"Failed to run nipa-update for node {self._nodeid}: {r.stderr}")
# Upload results to the storage
# Check key env var KCI_SSH_KEY
ssh_key_path = os.getenv("KCI_SSH_KEY")
Expand All @@ -78,7 +70,25 @@ class Job(BaseJob):
if self._api_name != "production":
ssh_username = "nipa-staging"
ssh_host = "storage.staging.kernelci.org"


# create a local directory for the nipa-results
local_nipa_results = "/tmp/kernelci-nipa/netdev-results"
if not os.path.exists(local_nipa_results):
os.makedirs(local_nipa_results)

# copy current(remote) nipa-results to a local directory
cmd = f"scp -P {ssh_port} -r -i {ssh_key_path} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null {ssh_username}@{ssh_host}:* {local_nipa_results}/netdev-results"
subprocess.run(cmd, shell=True)

# run the nipa-update
args = ["/tmp/kernelci-nipa/nipa-results", "--id", parent_job]
# if api_name is not production, add --staging
if self._api_name != "production":
args.append("--staging")
r = subprocess.run(args, cwd=nipa_path)
if r.returncode != 0:
raise Exception(f"Failed to run nipa-update for node {self._nodeid}: {r.stderr}")

cmd = f"scp -P {ssh_port} -r -i {ssh_key_path} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null {nipa_path}/netdev-results/* {ssh_username}@{ssh_host}:"
# scp nipa-results to the storage, recursive
subprocess.run(cmd, shell=True, cwd=nipa_path)
Expand Down
Loading