This is an automated email from the ASF dual-hosted git repository.
jstastnycz pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git
The following commit(s) were added to refs/heads/main by this push:
new c91568db kie-issues#749: fix nightly build and tests
c91568db is described below
commit c91568db4ac63fef447ac43113163ef6984d8542
Author: jstastny-cz <[email protected]>
AuthorDate: Mon Dec 11 08:30:12 2023 +0100
kie-issues#749: fix nightly build and tests
---
.ci/jenkins/Jenkinsfile.build-and-test | 1 +
.ci/jenkins/Jenkinsfile.build-image | 1 +
.ci/jenkins/Jenkinsfile.deploy | 1 +
.ci/jenkins/Jenkinsfile.promote | 11 +----------
scripts/common.py | 2 +-
tests/features/common-custom-truststore.feature | 2 +-
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test
b/.ci/jenkins/Jenkinsfile.build-and-test
index 4e99f9e1..c8ca9938 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -15,6 +15,7 @@ pipeline {
stage('Initialization') {
steps {
script {
+ util.waitForDocker()
sh 'printenv'
dir(getRepoName()) {
diff --git a/.ci/jenkins/Jenkinsfile.build-image
b/.ci/jenkins/Jenkinsfile.build-image
index 5436d77d..deb941c3 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -28,6 +28,7 @@ pipeline {
stage('Initialization') {
steps {
script {
+ util.waitForDocker()
sh 'printenv'
assert getBuildImageName() : 'Please provide
`BUILD_IMAGE_NAME` parameter'
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index a4ff1c6e..776766b3 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -29,6 +29,7 @@ pipeline {
stage('Initialization') {
steps {
script {
+ util.waitForDocker()
currentBuild.displayName = params.DISPLAY_NAME ?:
currentBuild.displayName
dir(getRepoName()) {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 41c877c7..5a9fd416 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -33,11 +33,10 @@ pipeline {
stage('Initialization') {
steps {
script {
- clean()
-
if (params.DISPLAY_NAME) {
currentBuild.displayName = params.DISPLAY_NAME
}
+ util.waitForDocker()
readDeployProperties()
@@ -61,8 +60,6 @@ pipeline {
dir(getRepoName()) {
checkoutRepo()
}
-
- cloud.installSkopeo()
}
}
}
@@ -141,12 +138,6 @@ void checkoutRepo() {
sh "git checkout ${getBuildBranch()}"
}
-void clean() {
- cleanWs()
- util.cleanNode()
- cloud.cleanSkopeo()
-}
-
void promoteImages() {
for (String imageName : getImages()) {
promoteImage(getOldImageFullTag(imageName),
getNewImageFullTag(imageName, getNewImageTag()))
diff --git a/scripts/common.py b/scripts/common.py
index f1d669b1..682a19a7 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -450,7 +450,7 @@ def update_examples_uri_in_clone_repo(examples_uri):
"""
print("Set examples_uri {} in clone-repo script".format(examples_uri))
pattern = re.compile(r'(git clone.*)')
- replacement = "git clone {}".format(examples_uri)
+ replacement = "git clone {} kogito-examples".format(examples_uri)
update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
def update_maven_repo_in_build_config(repo_url, replace_default_repository):
diff --git a/tests/features/common-custom-truststore.feature
b/tests/features/common-custom-truststore.feature
index b0d9ff3d..c82cb8cc 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -18,7 +18,7 @@
@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
Feature: Common tests for Custom TrustStore configuration
Scenario: Verify if a custom certificate is correctly handled
- When container is started with command bash -c "sleep 5s;
/home/kogito/kogito-app-launch.sh"
+ When container is started with command bash -c "sleep 10s;
/home/kogito/kogito-app-launch.sh"
| variable | value |
| CUSTOM_TRUSTSTORE | my-truststore.jks |
| RUNTIME_TYPE | quarkus |
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
