From 1eb796ccbf5428058e5a546fb4a34b3873586cf4 Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Aug 04 2021 06:31:53 +0000
Subject: [PATCH 1/2] Update C3I pipeline for OCP4


---

diff --git a/openshift/containers/jenkins-slave/Dockerfile b/openshift/containers/jenkins-slave/Dockerfile
index 6225814..984f3d0 100644
--- a/openshift/containers/jenkins-slave/Dockerfile
+++ b/openshift/containers/jenkins-slave/Dockerfile
@@ -95,4 +95,6 @@ RUN curl -L -o /usr/local/bin/tini \
 # For OpenShift we MUST use the UID of the user and not the name.
 USER ${UID}
 WORKDIR ${HOME_DIR}
+ENV JENKINS_HOME ${HOME_DIR}
+ENV HOME ${HOME_DIR}
 ENTRYPOINT ["/usr/local/bin/tini", "--", "jenkins-agent"]
diff --git a/openshift/pipelines/c3i-role-vars.yml b/openshift/pipelines/c3i-role-vars.yml
index 098a371..2547c93 100644
--- a/openshift/pipelines/c3i-role-vars.yml
+++ b/openshift/pipelines/c3i-role-vars.yml
@@ -22,6 +22,8 @@ c3i_lib_branch: master
 c3i_semaphore_custom_flags:
   - waiverdb-deployments-allowed
 
-c3i_tower_template_id_dev: 1701
-c3i_tower_template_id_stage: 1971
-c3i_tower_template_id_prod: 1972
+c3i_tower_template_id_dev: 7550
+c3i_tower_template_id_stage: 7551
+c3i_tower_template_id_prod: 7552
+
+c3i_ocp_namespace: waiverdb-test

From bcb9e1690cf858e3521c61507beef3aa133d2da2 Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Aug 04 2021 06:45:05 +0000
Subject: [PATCH 2/2] Drop publishing docs from c3i


Docs will be published automatically by readthedocs.

---

diff --git a/openshift/pipelines/snippets/waiverdb-build-and-test.groovy b/openshift/pipelines/snippets/waiverdb-build-and-test.groovy
index 3531c49..969698e 100644
--- a/openshift/pipelines/snippets/waiverdb-build-and-test.groovy
+++ b/openshift/pipelines/snippets/waiverdb-build-and-test.groovy
@@ -48,36 +48,6 @@ stage('Build Artifacts') {
             }
           }
         }
-        stage('Publish Docs') {
-          when {
-            expression {
-              return (env.GIT_REPO_REF == "master" || env.FORCE_PUBLISH_DOCS == "true")
-            }
-          }
-          steps {
-            sshagent (credentials: ["${env.TRIGGER_NAMESPACE}-${params.PAGURE_DOC_SECRET}"]) {
-              sh '''
-              mkdir -p ~/.ssh/
-              touch ~/.ssh/known_hosts
-              ssh-keygen -R pagure.io
-              echo 'pagure.io ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC198DWs0SQ3DX0ptu+8Wq6wnZMrXUCufN+wdSCtlyhHUeQ3q5B4Hgto1n2FMj752vToCfNTn9mWO7l2rNTrKeBsELpubl2jECHu4LqxkRVihu5UEzejfjiWNDN2jdXbYFY27GW9zymD7Gq3u+T/Mkp4lIcQKRoJaLobBmcVxrLPEEJMKI4AJY31jgxMTnxi7KcR+U5udQrZ3dzCn2BqUdiN5dMgckr4yNPjhl3emJeVJ/uhAJrEsgjzqxAb60smMO5/1By+yF85Wih4TnFtF4LwYYuxgqiNv72Xy4D/MGxCqkO/nH5eRNfcJ+AJFE7727F7Tnbo4xmAjilvRria/+l' >>~/.ssh/known_hosts
-              rm -rf docs-on-pagure
-              git clone ssh://git@pagure.io/docs/waiverdb.git docs-on-pagure
-              rm -rf docs-on-pagure/*
-              cp -r docs/_build/html/* docs-on-pagure/
-              cd docs-on-pagure
-              git config user.name 'Pipeline Bot'
-              git config user.email "pipeline-bot@localhost.localdomain"
-              git add -A .
-              if [[ "$(git diff --cached --numstat | wc -l)" -eq 0 ]] ; then
-                  exit 0 # No changes, nothing to commit
-              fi
-              git commit -m "Automatic commit of docs built by Jenkins job ${JOB_NAME} #${BUILD_NUMBER}"
-              git push origin master
-              '''
-            }
-          }
-        }
       }
     }
     stage('Build SRPM') {