Merge pull request #335 from python/codespeed_upgrade

restore codespeed local development
python · Jan 18, 2024 · 13984a9 · 13984a9
2 parents d633151 + 1700306
commit 13984a9
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 23 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -6,7 +6,7 @@ SERVERS = [
   {:name => "bugs", :box => "ubuntu/xenial64", :codename => "xenial", :ports => [8080]},
   "buildbot",
   "cdn-logs",
-  "codespeed",
+  {:name => "codespeed", :codename => "jammy"},
   {:name => "consul", :codename => "jammy"},
   "docs",
   "downloads",
@@ -15,7 +15,6 @@ SERVERS = [
   "mail",
   "moin",
   "planet",
-  "postgresql",
   "pypy-web",
   "pythontest",
   "web-pypa",

diff --git a/pillar/base/codespeed.sls b/pillar/base/codespeed.sls
@@ -5,7 +5,7 @@ codespeed-instances:
     db_name: codespeed-cpython
     port: 9000
     source: https://github.com/python/codespeed.git
-    source_ref: old-speed.python.org
+    source_ref: speed.python.org
     python_version: python3
     module: speed_python
     wsgi_app: speed_python.wsgi:application

diff --git a/pillar/dev/postgres/clusters.sls b/pillar/dev/postgres/clusters.sls
@@ -1,6 +1,6 @@
 postgresql-clusters:
   pg-vagrant-psf-io:
-    host: postgresql-primary.vagrant.psf.io
+    host: salt-master.vagrant.psf.io
     port: 5432
-    sslmode: verify-ca
+    sslmode: verify-full
     ca_cert_pillar: 'tls:ca:PSF_CA'
diff --git a/pillar/dev/roles.sls b/pillar/dev/roles.sls
@@ -55,11 +55,11 @@ roles:
     purpose: ""
     contact: ""
   postgresql:
-    pattern: "postgresql-*.vagrant.psf.io"
+    pattern: "salt-master.vagrant.psf.io"
     purpose: ""
     contact: ""
   postgresql-primary:
-    pattern: "postgresql-primary.vagrant.psf.io"
+    pattern: "salt-master.vagrant.psf.io"
     purpose: ""
     contact: ""
   postgresql-replica:

diff --git a/pillar/dev/secrets/codespeed.sls b/pillar/dev/secrets/codespeed.sls
@@ -0,0 +1,5 @@
+codespeed-secrets:
+  cpython:
+    secret_key: deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef
+  pypy:
+    secret_key: beefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead
diff --git a/pillar/dev/secrets/postgresql-users/codespeed.sls b/pillar/dev/secrets/postgresql-users/codespeed.sls
@@ -0,0 +1,9 @@
+postgresql-users:
+  codespeed-cpython:
+    cluster: pg-vagrant-psf-io
+    dbname: codespeed-cpython
+    password: insecurepasswordlol
+  codespeed-pypy:
+    cluster: pg-vagrant-psf-io
+    dbname: codespeed-pypy
+    password: insecurepasswordlol
diff --git a/pillar/dev/top.sls b/pillar/dev/top.sls
@@ -22,6 +22,13 @@ base:
     - fastly-logging
     - firewall.fastly-logging
 
+  'codespeed':
+    - match: nodegroup
+    - firewall.codespeed
+    - secrets.codespeed
+    - secrets.postgresql-users.codespeed
+    - codespeed
+
   'docs':
     - match: nodegroup
     - firewall.rs-lb-backend
@@ -60,26 +67,16 @@ base:
     - planet
     - firewall.http
 
-  'postgresql':
+  'salt-master':
     - match: nodegroup
+    - firewall.salt
+    - pebble
     - firewall.postgresql
     - postgresql.server
     - postgres.databases
-
-  'postgresql-primary':
-    - match: nodegroup
     - secrets.postgresql-admin
     - secrets.postgresql-users.all
 
-  'postgresql-replica':
-    - match: nodegroup
-    - secrets.postgresql-users.replica
-
-  'salt-master':
-    - match: nodegroup
-    - firewall.salt
-    - pebble
-
   'tracker':
     - match: nodegroup
     - secrets.postgresql-users.tracker

diff --git a/salt/codespeed/config/django-settings.py.jinja b/salt/codespeed/config/django-settings.py.jinja
@@ -14,7 +14,7 @@ DATABASES = {
         "USER": "{{ db_user}}",
         "PASSWORD": "{{ db_pass }}",
         "OPTIONS": {
-            "sslmode": "verify-full",
+            "sslmode": "verify-ca",
             "sslrootcert": "{{ db_cert }}",
         },
     }

diff --git a/salt/codespeed/init.sls b/salt/codespeed/init.sls
@@ -9,10 +9,12 @@ codespeed-deps:
     - pkgs:
       - git
       - mercurial
-      - python-dev
       - python3-dev
-      - python-virtualenv
       - python3-virtualenv
+      {% if grains["oscodename"] != "jammy" %}
+      - python-dev
+      - python-virtualenv
+      {% endif %}
       - build-essential
       - libpq-dev