Smalyshev has submitted this change and it was merged.
Change subject: wdqs - use the same deployment strategy on both eqiad and codfw
......................................................................
wdqs - use the same deployment strategy on both eqiad and codfw
We tried to introduce management of config file only on cdfw to ease the
transition to data partition moved on /srv. This seem to be more trouble
than is worth it, especially since this change is only for a transition
period.
This change will go back to having a single deployment strategy and having
the location of the data partition configured via a template.
Bug: T144380
Change-Id: I5e68dd7289c50fc9af98ab3a373f93aab103f571
---
M scap/checks.yaml
M scap/scap.cfg
R scap/wdqs-eqiad
3 files changed, 3 insertions(+), 19 deletions(-)
Approvals:
Smalyshev: Verified; Looks good to me, approved
diff --git a/scap/checks.yaml b/scap/checks.yaml
index 2b21c02..7a17c04 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,14 +1,4 @@
checks:
- create_symlink_jnl_1:
- type: command
- stage: promote
- group: canary
- command: ln -sf /var/lib/wdqs/wikidata.jnl
/srv/deployment/wdqs/wdqs/wikidata.jnl
- create_symlink_jnl_2:
- type: command
- stage: promote
- group: default
- command: ln -sf /var/lib/wdqs/wikidata.jnl
/srv/deployment/wdqs/wdqs/wikidata.jnl
create_symlink_rules:
type: command
stage: promote
diff --git a/scap/scap.cfg b/scap/scap.cfg
index d4c7144..2880493 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -1,22 +1,16 @@
[global]
-server_groups: canary, default
+server_groups: canary, codfw, eqiad
git_repo: wdqs/wdqs
git_submodules: True
git_fat: True
service_port: 9999
service_name: wdqs-blazegraph
dsh_targets: wdqs
-codfw_dsh_targets: wdqs-codfw
canary_dsh_targets: wdqs-canary
+codfw_dsh_targets: wdqs-codfw
+eqiad_dsh_targets: wdqs-eqiad
ssh_user: deploy-service
-# For now, only deploy config on codfw
-config_deploy: false
-
-[codfw.wmnet]
-# For now, only deploy condig on codfw
config_deploy: true
-server_groups: codfw
-git_server: mira.codfw.wmnet
[wmflabs]
git_server: deployment-bastion.deployment-prep.eqiad.wmflabs
diff --git a/scap/wdqs b/scap/wdqs-eqiad
similarity index 100%
rename from scap/wdqs
rename to scap/wdqs-eqiad
--
To view, visit https://gerrit.wikimedia.org/r/309961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e68dd7289c50fc9af98ab3a373f93aab103f571
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/deploy
Gerrit-Branch: master
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
