This is an automated email from the ASF dual-hosted git repository.
ricardozanini pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-serverless-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 3fe48d98 Fix #300 - :o: Initial OpenShift removal, unnecessary
checkout (#301)
3fe48d98 is described below
commit 3fe48d98a54168cdb56644efa4b5c33480e4e326
Author: Ricardo Zanini <[email protected]>
AuthorDate: Thu Nov 9 15:56:42 2023 -0300
Fix #300 - :o: Initial OpenShift removal, unnecessary checkout (#301)
Signed-off-by: Ricardo Zanini <[email protected]>
---
.ci/jenkins/Jenkinsfile.deploy | 7 -------
.ci/jenkins/dsl/jobs.groovy | 7 -------
.ci/jenkins/scripts/helper.groovy | 2 +-
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 0443be01..9df84784 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -196,13 +196,6 @@ pipeline {
}
}
}
- stage('Run tests on Openshift') {
- steps {
- script {
- launchE2ETestsJob('openshift')
- }
- }
- }
}
}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 3372013e..b1cf087d 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -19,10 +19,6 @@ clustersConfig = [
MINIKUBE_VERSION: '1.30.1',
KUBERNETES_VERSION: '1.26.3',
],
- openshift: [
- OPENSHIFT_API_KEY: 'OPENSHIFT_API',
- OPENSHIFT_CREDS_KEY: 'OPENSHIFT_CREDS',
- ],
]
// Setup branch
@@ -94,7 +90,6 @@ void setupDeployJob(JobType jobType) {
booleanParam('SKIP_TESTS', false, 'Skip tests')
// Deploy information
- booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true
if image should be deployed in Openshift registry.In this case,
IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will
be ignored')
stringParam('IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to
deploy images. Will be ignored if no IMAGE_REGISTRY is given')
stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image
registry to use to deploy images')
stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image
namespace to use to deploy images')
@@ -136,7 +131,6 @@ void setupPromoteJob(JobType jobType) {
stringParam('DEPLOY_BUILD_URL', '', 'URL to jenkins deploy build
to retrieve the `deployment.properties` file. If base parameters are defined,
they will override the `deployment.properties` information')
// Base information which can override `deployment.properties`
- booleanParam('BASE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Override
`deployment.properties`. Set to true if base image should be deployed in
Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS,
BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Override `deployment.properties`. Base
Image registry credentials to use to deploy images. Will be ignored if no
BASE_IMAGE_REGISTRY is given')
stringParam('BASE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}",
'Override `deployment.properties`. Base image registry')
stringParam('BASE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}",
'Override `deployment.properties`. Base image namespace')
@@ -144,7 +138,6 @@ void setupPromoteJob(JobType jobType) {
stringParam('BASE_IMAGE_TAG', '', 'Override
`deployment.properties`. Base image tag')
// Promote information
- booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set
to true if base image should be deployed in Openshift registry.In this case,
PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and
PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Promote Image registry credentials to
use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
stringParam('PROMOTE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}",
'Promote image registry')
stringParam('PROMOTE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}",
'Promote image namespace')
diff --git a/.ci/jenkins/scripts/helper.groovy
b/.ci/jenkins/scripts/helper.groovy
index c9c848a8..616e8703 100644
--- a/.ci/jenkins/scripts/helper.groovy
+++ b/.ci/jenkins/scripts/helper.groovy
@@ -51,7 +51,7 @@ void checkoutRepo(String repoName = '', String directory =
'') {
deleteDir()
checkout(githubscm.resolveRepository(repoName, getGitAuthor(),
getBuildBranch(), false))
// need to manually checkout branch since on a detached branch after
checkout command
- sh "git checkout ${getBuildBranch()}"
+ //sh "git checkout ${getBuildBranch()}"
}
if (directory) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
