diff --git a/docs/operations/ci/adding_cico_tenant/adding_cico_tenants.md b/docs/operations/ci/adding_cico_tenant/adding_cico_tenants.md index 68a6cf6..862e841 100644 --- a/docs/operations/ci/adding_cico_tenant/adding_cico_tenants.md +++ b/docs/operations/ci/adding_cico_tenant/adding_cico_tenants.md @@ -28,16 +28,16 @@ Project_members: ## Steps -1. Create an entry in duffy db (with ssh key) - [follow adding-duffy-api-key.md](/operations/ci/adding_cico_tenant/adding -duffy-api-key/) +1. Create an entry in duffy db (with ssh key) - [follow adding-duffy-tenant.md](/operations/ci/adding_cico_tenant/adding-duffy-tenant/) 2. Create an OpenShift namespace/project (done with ansible) 3. Create a PV(Persistent Volume) and deploy Jenkins instance (done with ansible) -## Create an entry in duffy db (with ssh key) - [follow adding-duffy-api-key.md](/operations/ci/adding_cico_tenant/adding-duffy-api-key/) +## Create an entry in duffy db (with ssh key) - [follow adding-duffy-tenant.md](/operations/ci/adding_cico_tenant/adding-duffy-tenant/) ### Create an OpenShift namespace -!!! important +!!! important we don't use the previous specific git repo for projects, as it's now all using the `ocp-admin` ansible role, see below To create the openshift namespace/project, just add edit the inventory/host_vars/ and add the new project to the existin `ocp_projects_list` ansible list. @@ -60,10 +60,10 @@ Once done, don't forget to commit/push and you can then apply remotely from cent    ~  ansible  CentOS_CI  ./filestore/remote_ansible_call    [+] 20220325-15:10 ansible-ara-run -> == Ansible Ara manual trigger == Which ansible role you want to play ? (like haproxy, without -role) => ocp-admin-node -List of possible tags for role ocp-admin-node : +List of possible tags for role ocp-admin-node : => TASK TAGS: [backup, certs, config, localstorage, projects, tls] Do you want to call specific tag[s] and which one[s] ? (can be empty) => projects -Host/Group limits ? (default to whole group) => +Host/Group limits ? (default to whole group) => [+] 20220325-15:11 ansible-ara-run -> Updating first inventory/pkistore/filestore [+] 20220325-15:11 ansible-ara-run -> Checking role [ocp-admin-node] is present and up2date ... [+] 20220325-15:11 ansible-ara-run -> Calling now ansible with ara reporting ... @@ -72,7 +72,7 @@ Host/Group limits ? (default to whole group) => PLAY [hostgroup-role-ocp-admin-node] ***************************************************************************** TASK [ocp-admin-node : Rendering template for projects] ********************************************************** -Friday 25 March 2022 15:11:08 +0000 (0:00:00.445) 0:00:00.445 ********** +Friday 25 March 2022 15:11:08 +0000 (0:00:00.445) 0:00:00.445 ********** ok: [ocp-admin.ci.centos.org] => (item=ci-infra-test) ok: [ocp-admin.ci.centos.org] => (item=samba) ok: [ocp-admin.ci.centos.org] => (item=hyperscale) @@ -82,26 +82,26 @@ ok: [ocp-admin.ci.centos.org] => (item=pagure) ok: [ocp-admin.ci.centos.org] => (item=sp-augur) TASK [ocp-admin-node : Creating/modifying project if needed] ***************************************************** -Friday 25 March 2022 15:11:11 +0000 (0:00:02.892) 0:00:03.337 ********** -skipping: [ocp-admin.ci.centos.org] => (item=ci-infra-test) -skipping: [ocp-admin.ci.centos.org] => (item=samba) -skipping: [ocp-admin.ci.centos.org] => (item=hyperscale) -skipping: [ocp-admin.ci.centos.org] => (item=networkmanager) -skipping: [ocp-admin.ci.centos.org] => (item=gluster) -skipping: [ocp-admin.ci.centos.org] => (item=pagure) -skipping: [ocp-admin.ci.centos.org] => (item=sp-augur) +Friday 25 March 2022 15:11:11 +0000 (0:00:02.892) 0:00:03.337 ********** +skipping: [ocp-admin.ci.centos.org] => (item=ci-infra-test) +skipping: [ocp-admin.ci.centos.org] => (item=samba) +skipping: [ocp-admin.ci.centos.org] => (item=hyperscale) +skipping: [ocp-admin.ci.centos.org] => (item=networkmanager) +skipping: [ocp-admin.ci.centos.org] => (item=gluster) +skipping: [ocp-admin.ci.centos.org] => (item=pagure) +skipping: [ocp-admin.ci.centos.org] => (item=sp-augur) TASK [ocp-admin-node : Deleting project[s] if needed] ************************************************************ -Friday 25 March 2022 15:11:12 +0000 (0:00:00.597) 0:00:03.935 ********** +Friday 25 March 2022 15:11:12 +0000 (0:00:00.597) 0:00:03.935 ********** ok: [ocp-admin.ci.centos.org] => (item=fedora-coreos) ok: [ocp-admin.ci.centos.org] => (item=coreos-ci) PLAY RECAP ******************************************************************************************************* -n4-136.cloud.ci.centos.org : ok=0 changed=0 unreachable=0 failed=0 skipped=3 rescued=0 ignored=0 -ocp-admin.ci.centos.org : ok=2 changed=0 unreachable=0 failed=0 skipped=1 rescued=0 ignored=0 +n4-136.cloud.ci.centos.org : ok=0 changed=0 unreachable=0 failed=0 skipped=3 rescued=0 ignored=0 +ocp-admin.ci.centos.org : ok=2 changed=0 unreachable=0 failed=0 skipped=1 rescued=0 ignored=0 -Friday 25 March 2022 15:11:13 +0000 (0:00:01.320) 0:00:05.255 ********** -=============================================================================== +Friday 25 March 2022 15:11:13 +0000 (0:00:01.320) 0:00:05.255 ********** +=============================================================================== ocp-admin-node : Rendering template for projects --------------------------------------------------------- 2.89s ocp-admin-node : Deleting project[s] if needed ------------------------------------------------------------ 1.32s ocp-admin-node : Creating/modifying project if needed ----------------------------------------------------- 0.60s @@ -119,7 +119,7 @@ Playbook run took 0 days, 0 hours, 0 minutes, 5 seconds ## Deploy a PV (Persistent Volume) and Jenkins instance !!! note - In case you just need to create a PV *outside* of jenkins, follow [Persistent storage via NFS](https://docs.infra.centos.org/operations/ci/installation/persistant_storage_nfs/). + In case you just need to create a PV *outside* of jenkins, follow [Persistent storage via NFS](https://docs.infra.centos.org/operations/ci/installation/persistant_storage_nfs/). We have an ad-hoc ansible task (adhoc-ocp-deploy-jenkins-for-ci-tenant.yml) that will create the needed PV , create a template and apply it with the correct ssh keys and duffy api key so ensure that you followed previous steps so that you have the project keys into pkistore git repo (using project name) and also duffy api key ready (as script will ask you for it): @@ -136,7 +136,7 @@ Existing Duffy API key : ``` -Now you just have to wait for jenkins to be up and running +Now you just have to wait for jenkins to be up and running !!! important We recently had an issue with the default jenkins image having outdated (and not working) [openshift sync plugin](https://plugins.jenkins.io/openshift-sync/) so be sure that you have at least 1.0.51 running in openshift. If not, update it first, and then configmap will be synced to jenkins, for the `cico-workspace` pod template diff --git a/mkdocs.yml b/mkdocs.yml index b54a712..69f60bd 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -28,8 +28,7 @@ nav: - operations/ci/localstorage/installation.md - Onboard Tenants: - operations/ci/adding_cico_tenant/adding_cico_tenants.md - - operations/ci/adding_cico_tenant/adding-duffy-api-key.md - - operations/ci/adding_cico_tenant/adding-jumphost.md + - operations/ci/adding_cico_tenant/adding-duffy-tenant.md - Add an OpenID identity provider to the cluster: operations/ci/adding_oidc_authentication.md - Adding Admin Users: operations/ci/adding_admin_users.md - Adding Nodes: operations/ci/adding_nodes.md