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 errors with creating dimension rows #888

Merged
merged 3 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/custom_docker_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- docker-image: ./images/cache-indexer
image-tags: ghcr.io/spack/cache-indexer:0.0.3
- docker-image: ./analytics
image-tags: ghcr.io/spack/django:0.3.0
image-tags: ghcr.io/spack/django:0.3.1
- docker-image: ./images/ci-prune-buildcache
image-tags: ghcr.io/spack/ci-prune-buildcache:0.0.3
- docker-image: ./images/protected-publish
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 4.2.4 on 2024-06-24 21:01

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("core", "0018_rename_legacy_models"),
]

operations = [
migrations.AlterField(
model_name="runnerdimension",
name="name",
field=models.CharField(max_length=64),
),
]
2 changes: 1 addition & 1 deletion analytics/analytics/core/models/dimensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ class Meta:

class RunnerDimension(models.Model):
runner_id = models.PositiveIntegerField(primary_key=True)
name = models.CharField(max_length=64, unique=True)
name = models.CharField(max_length=64)
platform = models.CharField(max_length=64)
host = models.CharField(max_length=32)
arch = models.CharField(max_length=32)
Expand Down
2 changes: 1 addition & 1 deletion analytics/analytics/job_processor/dimensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def create_runner_dimension(

return RunnerDimension.objects.create(
runner_id=runner_id,
name=runner.description,
name=runner_name,
platform=runner.platform,
host=host,
arch=runner.architecture,
Expand Down
4 changes: 2 additions & 2 deletions analytics/analytics/job_processor/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def retrieve_job_info(gljob: ProjectJob) -> JobInfo:
hash=artifacts.package_hash,
version=artifacts.package_version,
compiler_name=artifacts.compiler_name,
compiler_version=artifacts.compiler_name,
compiler_version=artifacts.compiler_version,
arch=artifacts.arch,
variants=artifacts.package_variants,
),
Expand Down Expand Up @@ -150,7 +150,7 @@ def retrieve_job_info(gljob: ProjectJob) -> JobInfo:
hash=pod_labels.package_hash,
version=pod_labels.package_version,
compiler_name=pod_labels.compiler_name,
compiler_version=pod_labels.compiler_name,
compiler_version=pod_labels.compiler_version,
arch=pod_labels.arch,
variants=pod_labels.package_variants,
),
Expand Down
4 changes: 2 additions & 2 deletions k8s/production/custom/webhook-handler/deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
serviceAccountName: webhook-handler
containers:
- name: webhook-handler
image: ghcr.io/spack/django:0.3.0
image: ghcr.io/spack/django:0.3.1
imagePullPolicy: Always
resources:
requests:
Expand Down Expand Up @@ -146,7 +146,7 @@ spec:
serviceAccountName: webhook-handler
containers:
- name: webhook-handler-worker
image: ghcr.io/spack/django:0.3.0
image: ghcr.io/spack/django:0.3.1
command: ["celery", "-A", "analytics.celery", "worker", "-l", "info", "-Q", "celery"]
imagePullPolicy: Always
resources:
Expand Down