From 4ec9b16758ccd85d15b018608ba675a4e0f12488 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 14 May 2019 08:31:24 -0400 Subject: [PATCH] Change credential ID for ceph-jenkins github account's ssh key Signed-off-by: David Galloway --- ansible/examples/slave.yml | 2 +- ansible/examples/slave_libvirt.yml | 2 +- ansible/examples/slave_static.yml | 4 ++-- ansible/slave.yml | 2 +- ansible/slave_libvirt.yml | 2 +- .../config/definitions/calamari-clients-setup.yml | 2 +- calamari/config/definitions/calamari.yml | 2 +- .../config/definitions/ceph-ansible-galaxy.yml | 2 +- ceph-deploy-tag/config/definitions/ceph-tag.yml | 2 +- ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml | 2 +- ceph-dev-setup/config/definitions/ceph-dev-setup.yml | 2 +- ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml | 2 +- ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml | 2 +- ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml | 2 +- ceph-iscsi/config/definitions/ceph-iscsi.yml | 2 +- ceph-setup/config/definitions/ceph-setup.yml | 2 +- ceph-tag/config/definitions/ceph-tag.yml | 2 +- .../config/definitions/cephmetrics-release.yml | 2 +- cephmetrics/config/definitions/cephmetrics.yml | 2 +- diamond-setup/config/definitions/diamond-setup.yml | 2 +- rtslib-fb/config/definitions/rtslib-fb.yml | 2 +- samba/config/definitions/samba.yml | 2 +- tcmu-runner/config/definitions/tcmu-runner.yml | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ansible/examples/slave.yml b/ansible/examples/slave.yml index a1601d40..835403a3 100644 --- a/ansible/examples/slave.yml +++ b/ansible/examples/slave.yml @@ -9,7 +9,7 @@ - api_user: 'ceph-jenkins' - token: '{{ token }}' - api_uri: 'https://jenkins.ceph.com' - - jenkins_credentials_uuid: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + - jenkins_credentials_uuid: 'jenkins-build' - nodename: '{{ nodename }}' - labels: '{{ labels }}' - use_jnlp: false diff --git a/ansible/examples/slave_libvirt.yml b/ansible/examples/slave_libvirt.yml index 367d31bb..7725192c 100644 --- a/ansible/examples/slave_libvirt.yml +++ b/ansible/examples/slave_libvirt.yml @@ -9,7 +9,7 @@ - api_user: 'ceph-jenkins' - token: '{{ token }}' - api_uri: 'https://jenkins.ceph.com' - - jenkins_credentials_uuid: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + - jenkins_credentials_uuid: 'jenkins-build' - nodename: '{{ nodename }}' - labels: '{{ labels }}' - use_jnlp: false diff --git a/ansible/examples/slave_static.yml b/ansible/examples/slave_static.yml index bebac418..326fff5c 100644 --- a/ansible/examples/slave_static.yml +++ b/ansible/examples/slave_static.yml @@ -275,7 +275,7 @@ name: "{{ ansible_default_ipv4.address }}+{{ nodename }}" labels: "{{ labels }}" host: "{{ ansible_default_ipv4.address }}" - credentialsId: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentialsId: 'jenkins-build' remoteFS: '/home/{{ jenkins_user }}/build' executors: '{{ executors|default(1) }}' exclusive: true @@ -292,7 +292,7 @@ name: "{{ ansible_default_ipv4.address }}+{{ nodename }}" labels: "{{ labels }}" host: "{{ ansible_default_ipv4.address }}" - credentialsId: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentialsId: 'jenkins-build' launcher: 'hudson.slaves.JNLPLauncher' remoteFS: '/home/{{ jenkins_user }}/build' # XXX this should be configurable, not all nodes should have one executor diff --git a/ansible/slave.yml b/ansible/slave.yml index a1601d40..835403a3 100644 --- a/ansible/slave.yml +++ b/ansible/slave.yml @@ -9,7 +9,7 @@ - api_user: 'ceph-jenkins' - token: '{{ token }}' - api_uri: 'https://jenkins.ceph.com' - - jenkins_credentials_uuid: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + - jenkins_credentials_uuid: 'jenkins-build' - nodename: '{{ nodename }}' - labels: '{{ labels }}' - use_jnlp: false diff --git a/ansible/slave_libvirt.yml b/ansible/slave_libvirt.yml index 367d31bb..7725192c 100644 --- a/ansible/slave_libvirt.yml +++ b/ansible/slave_libvirt.yml @@ -9,7 +9,7 @@ - api_user: 'ceph-jenkins' - token: '{{ token }}' - api_uri: 'https://jenkins.ceph.com' - - jenkins_credentials_uuid: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + - jenkins_credentials_uuid: 'jenkins-build' - nodename: '{{ nodename }}' - labels: '{{ labels }}' - use_jnlp: false diff --git a/calamari-clients-setup/config/definitions/calamari-clients-setup.yml b/calamari-clients-setup/config/definitions/calamari-clients-setup.yml index 7fb6d67a..02912c51 100644 --- a/calamari-clients-setup/config/definitions/calamari-clients-setup.yml +++ b/calamari-clients-setup/config/definitions/calamari-clients-setup.yml @@ -26,7 +26,7 @@ - git: url: git@github.com:ceph/calamari-clients.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/calamari/config/definitions/calamari.yml b/calamari/config/definitions/calamari.yml index 8dc009dd..13f83061 100644 --- a/calamari/config/definitions/calamari.yml +++ b/calamari/config/definitions/calamari.yml @@ -70,7 +70,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/calamari.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml b/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml index b757370b..f7c3e1f9 100644 --- a/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml +++ b/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml @@ -39,4 +39,4 @@ - ssh-agent-credentials: # "jenkins-build" SSH key, needed for access to ceph-ansible.git users: - - '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + - 'jenkins-build' diff --git a/ceph-deploy-tag/config/definitions/ceph-tag.yml b/ceph-deploy-tag/config/definitions/ceph-tag.yml index d85168f0..65c3acd2 100644 --- a/ceph-deploy-tag/config/definitions/ceph-tag.yml +++ b/ceph-deploy-tag/config/definitions/ceph-tag.yml @@ -49,4 +49,4 @@ - ssh-agent-credentials: # "jenkins-build" SSH key, needed so we can push to # ceph-deploy.git - user: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + user: 'jenkins-build' diff --git a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml index 4474a60b..d70a87e8 100644 --- a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml +++ b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml @@ -26,7 +26,7 @@ - git: url: git@github.com:ceph/ceph-ci.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/ceph-dev-setup/config/definitions/ceph-dev-setup.yml b/ceph-dev-setup/config/definitions/ceph-dev-setup.yml index bfab90fe..8c1bf29d 100644 --- a/ceph-dev-setup/config/definitions/ceph-dev-setup.yml +++ b/ceph-dev-setup/config/definitions/ceph-dev-setup.yml @@ -26,7 +26,7 @@ - git: url: git@github.com:ceph/ceph.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml b/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml index 39d852a0..a52bfbf8 100644 --- a/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml +++ b/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml @@ -72,7 +72,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/ceph-iscsi-cli.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml b/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml index fbbcdcf5..c7b0f505 100644 --- a/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml +++ b/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml @@ -72,7 +72,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/ceph-iscsi-config.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml b/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml index a815ec56..cfbd8476 100644 --- a/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml +++ b/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml @@ -71,7 +71,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/ceph-iscsi-tools.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/ceph-iscsi/config/definitions/ceph-iscsi.yml b/ceph-iscsi/config/definitions/ceph-iscsi.yml index 7bacf14b..2ee2bfb1 100644 --- a/ceph-iscsi/config/definitions/ceph-iscsi.yml +++ b/ceph-iscsi/config/definitions/ceph-iscsi.yml @@ -70,7 +70,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/ceph-iscsi.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/ceph-setup/config/definitions/ceph-setup.yml b/ceph-setup/config/definitions/ceph-setup.yml index dc6da0cb..f76fbc56 100644 --- a/ceph-setup/config/definitions/ceph-setup.yml +++ b/ceph-setup/config/definitions/ceph-setup.yml @@ -26,7 +26,7 @@ - git: url: git@github.com:ceph/ceph-releases.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' # not really a branch, this builds the TAG that was previously # created by the ceph-tag job which concatenates 'v' + $VERSION branches: diff --git a/ceph-tag/config/definitions/ceph-tag.yml b/ceph-tag/config/definitions/ceph-tag.yml index aac9c479..73505cfd 100644 --- a/ceph-tag/config/definitions/ceph-tag.yml +++ b/ceph-tag/config/definitions/ceph-tag.yml @@ -50,4 +50,4 @@ - ssh-agent-credentials: # "jenkins-build" SSH key, needed so we can push to # ceph-deploy.git - user: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + user: 'jenkins-build' diff --git a/cephmetrics-release/config/definitions/cephmetrics-release.yml b/cephmetrics-release/config/definitions/cephmetrics-release.yml index b77338c2..d9256e67 100644 --- a/cephmetrics-release/config/definitions/cephmetrics-release.yml +++ b/cephmetrics-release/config/definitions/cephmetrics-release.yml @@ -72,7 +72,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/cephmetrics.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' skip-tag: true branches: - $BRANCH diff --git a/cephmetrics/config/definitions/cephmetrics.yml b/cephmetrics/config/definitions/cephmetrics.yml index 263abdc8..a3fa54e1 100644 --- a/cephmetrics/config/definitions/cephmetrics.yml +++ b/cephmetrics/config/definitions/cephmetrics.yml @@ -72,7 +72,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/cephmetrics.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' skip-tag: true wipe-workspace: false diff --git a/diamond-setup/config/definitions/diamond-setup.yml b/diamond-setup/config/definitions/diamond-setup.yml index 85a9a110..3ae31e66 100644 --- a/diamond-setup/config/definitions/diamond-setup.yml +++ b/diamond-setup/config/definitions/diamond-setup.yml @@ -26,7 +26,7 @@ - git: url: git@github.com:ceph/Diamond.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/rtslib-fb/config/definitions/rtslib-fb.yml b/rtslib-fb/config/definitions/rtslib-fb.yml index 8b21302b..82a4d675 100644 --- a/rtslib-fb/config/definitions/rtslib-fb.yml +++ b/rtslib-fb/config/definitions/rtslib-fb.yml @@ -70,7 +70,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/rtslib-fb.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true diff --git a/samba/config/definitions/samba.yml b/samba/config/definitions/samba.yml index 0ee301f6..7ff78300 100644 --- a/samba/config/definitions/samba.yml +++ b/samba/config/definitions/samba.yml @@ -81,7 +81,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/samba.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $SAMBA_BRANCH skip-tag: true diff --git a/tcmu-runner/config/definitions/tcmu-runner.yml b/tcmu-runner/config/definitions/tcmu-runner.yml index bf0bc9f6..06976457 100644 --- a/tcmu-runner/config/definitions/tcmu-runner.yml +++ b/tcmu-runner/config/definitions/tcmu-runner.yml @@ -77,7 +77,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if - git: url: git@github.com:ceph/tcmu-runner.git # Use the SSH key attached to the ceph-jenkins GitHub account. - credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d' + credentials-id: 'jenkins-build' branches: - $BRANCH skip-tag: true -- 2.39.5