From 3020d0b7d9cadfda21fda739fe9ccc9b2af3934a Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Wed, 4 Jul 2018 02:48:27 +0200
Subject: [PATCH] Templatize osc credentials
Store the id of the credentials used to interact with OBS in a
single place.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
defaults.yaml.inc | 1 +
packaging/apertis-build-linux.yaml | 2 +-
packaging/apertis-build-package.yaml | 2 +-
packaging/apertis-build-packaging.yaml | 2 +-
packaging/apertis-build-sample.yaml | 2 +-
packaging/phabricator-apertis-master-build-snapshot.yaml | 4 ++--
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/defaults.yaml.inc b/defaults.yaml.inc
index 215b3d9..507afe3 100644
--- a/defaults.yaml.inc
+++ b/defaults.yaml.inc
@@ -6,3 +6,4 @@ maintainers: 'maintainers@lists.apertis.org'
repobase: 'git@gitlab.apertis.org:'
weekday: '*'
git-credentials-id: 'df7b609b-df30-431d-a942-af263af80571'
+osc-credentials-id: '349d474d-a6d0-4ab0-987a-a3843916bdff'
diff --git a/packaging/apertis-build-linux.yaml b/packaging/apertis-build-linux.yaml
index d15dd6c..61de3a0 100644
--- a/packaging/apertis-build-linux.yaml
+++ b/packaging/apertis-build-linux.yaml
@@ -37,7 +37,7 @@
- timestamps
- credentials-binding:
- file:
- credential-id: 349d474d-a6d0-4ab0-987a-a3843916bdff
+ credential-id: '{osc-credentials-id}'
variable: OSCRC
triggers:
- pollscm:
diff --git a/packaging/apertis-build-package.yaml b/packaging/apertis-build-package.yaml
index 2f4f99a..2133214 100644
--- a/packaging/apertis-build-package.yaml
+++ b/packaging/apertis-build-package.yaml
@@ -50,7 +50,7 @@
- timestamps
- credentials-binding:
- file:
- credential-id: 349d474d-a6d0-4ab0-987a-a3843916bdff
+ credential-id: '{osc-credentials-id}'
variable: OSCRC
triggers:
- pollscm:
diff --git a/packaging/apertis-build-packaging.yaml b/packaging/apertis-build-packaging.yaml
index 3d53cf2..c283a89 100644
--- a/packaging/apertis-build-packaging.yaml
+++ b/packaging/apertis-build-packaging.yaml
@@ -52,7 +52,7 @@
- timestamps
- credentials-binding:
- file:
- credential-id: 349d474d-a6d0-4ab0-987a-a3843916bdff
+ credential-id: '{osc-credentials-id}'
variable: OSCRC
triggers:
- pollscm:
diff --git a/packaging/apertis-build-sample.yaml b/packaging/apertis-build-sample.yaml
index 439dd0b..98a849b 100644
--- a/packaging/apertis-build-sample.yaml
+++ b/packaging/apertis-build-sample.yaml
@@ -40,7 +40,7 @@
- timestamps
- credentials-binding:
- file:
- credential-id: 349d474d-a6d0-4ab0-987a-a3843916bdff
+ credential-id: '{osc-credentials-id}'
variable: OSCRC
triggers:
- pollscm:
diff --git a/packaging/phabricator-apertis-master-build-snapshot.yaml b/packaging/phabricator-apertis-master-build-snapshot.yaml
index e7f4d41..615713e 100644
--- a/packaging/phabricator-apertis-master-build-snapshot.yaml
+++ b/packaging/phabricator-apertis-master-build-snapshot.yaml
@@ -58,7 +58,7 @@
# credential-id: apertis-phabricator-arcrc
# variable: ARCRC
# - file:
- # credential-id: 349d474d-a6d0-4ab0-987a-a3843916bdff
+ # credential-id: '{osc-credentials-id}'
# variable: OSCRC
- raw:
xml: |
@@ -70,7 +70,7 @@
</org.jenkinsci.plugins.credentialsbinding.impl.FileBinding>
<org.jenkinsci.plugins.credentialsbinding.impl.FileBinding>
<variable>OSCRC</variable>
- <credentialsId>349d474d-a6d0-4ab0-987a-a3843916bdff</credentialsId>
+ <credentialsId>{osc-credentials-id}</credentialsId>
</org.jenkinsci.plugins.credentialsbinding.impl.FileBinding>
<org.jenkinsci.plugins.credentialsbinding.impl.SSHUserPrivateKeyBinding>
<keyFileVariable>GIT_SSH_KEY</keyFileVariable>
--
GitLab