Manually repeat changes in deploy role and update deploy test after rebase

Before using the deploy role in the deploy playbook.
Wait for the deploy tests to be reviewed, up and running.
Every change in the deploy playbook has to be repeated manually
back in the deploy role, in the meantime.

Co-authored-by: Laura Barcziová <[email protected]>

Author: majamassarini

playbooks/deploy.yml

@@ -441,7 +441,7 @@
       when: workers_long_running > 0
 
     - name: Wait for deploymentconfig rollouts to complete
-      # timeout 10min to not wait indefinitely in case of a problem
+      # timeout 15min to not wait indefinitely in case of a problem
       ansible.builtin.command: timeout 15m oc rollout status -w deploy/{{ item }}
       register: oc_rollout_status
       changed_when: false

playbooks/roles/deploy/tasks/main.yml

@@ -115,6 +115,7 @@
     - "{{ lookup('template', '{{ project_dir }}/openshift/secret-postgres.yml.j2') }}"
     - "{{ lookup('template', '{{ project_dir }}/openshift/secret-aws.yml.j2') }}"
     - "{{ lookup('template', '{{ project_dir }}/openshift/secret-splunk.yml.j2') }}"
+    - "{{ lookup('template', '{{ project_dir }}/openshift/secret-centpkg-sig.yml.j2') }}"
   tags:
     - secrets
 

playbooks/roles/generate_secrets/files/centpkg-sig.conf.j2

@@ -0,0 +1,32 @@
+[centpkg-sig]
+lookaside = https://git.centos.org/sources
+lookasidehash = sha512
+lookaside_cgi = https://git.centos.org/sources/upload_sig.cgi
+# lookaside_cgi = https://git.centos.org/sources/upload.cgi
+distgit_namespaced = True
+distgit_namespaces = rpms
+gitbaseurl = git+ssh://[email protected]/CentOS/%(repo)s.git
+anongiturl = https://gitlab.com/CentOS/%(repo)s.git
+branchre = c\d+s?-sig-.+|master$
+kojiprofile = cbs
+build_client = cbs
+lookaside_namespaced = True
+git_excludes =
+  i386/
+  i686/
+  x86_64/
+  ppc/
+  ppc64/
+  ia64/
+  mips/
+  arm/
+  noarch/
+  /*.src.rpm
+  /build*.log
+  /.build-*.log
+  results_*/
+  clog
+
+[centpkg-sig.distgit]
+apibaseurl = https://gitlab.com
+token = 111aaaAAA

playbooks/roles/generate_secrets/tasks/generate-configs.yml

@@ -13,3 +13,4 @@
     - fedora.toml.j2
     - copr
     - ssh_config
+    - centpkg-sig.conf.j2

playbooks/test_deploy_setup.yml

@@ -95,7 +95,7 @@
           check_up_to_date: false
           # Whether to deploy and check that pod
           # Let's preserve some resources
-          with_tokman: true
+          with_tokman: false
           with_beat: true
           with_fedmsg: true
           with_dashboard: true