Skip to content

Commit

Permalink
Merge branch 'kie-issues#1059-EPIC-Sonataflow-management-console' int…
Browse files Browse the repository at this point in the history
…o kie-issues#1061-Create-Sonataflow-management-console-image-2
  • Loading branch information
fantonangeli committed Jun 28, 2024
2 parents bd02a5e + f52182b commit 92e2141
Show file tree
Hide file tree
Showing 2,850 changed files with 279,445 additions and 211,714 deletions.
10 changes: 5 additions & 5 deletions .ci/incubator-kie-tools-ci-build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cruizba/ubuntu-dind:noble-26.1.3
FROM cruizba/ubuntu-dind:jammy-26.1.4

SHELL ["/bin/bash", "-c"]

Expand Down Expand Up @@ -45,7 +45,7 @@ xvfb \
fluxbox \
subversion && \
apt-get clean autoclean && apt-get autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}/
rm -rf /var/lib/{apt,cache,log}/

# Install firefox
RUN wget -O /tmp/firefox-latest.tar.bz2 "https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US" && \
Expand Down Expand Up @@ -91,7 +91,7 @@ RUN source $HOME/.nvm/nvm.sh && \
# Maven setup
RUN curl -s "https://get.sdkman.io" | bash && \
source "$HOME/.sdkman/bin/sdkman-init.sh" && \
sdk install java 17.0.10-zulu && \
sdk install java 17.0.11-tem && \
sudo update-alternatives --install /usr/local/bin/java java $(which java) 1 && \
sdk install maven 3.9.6 && \
sudo update-alternatives --install /usr/local/bin/mvn mvn $(which mvn) 1 && \
Expand All @@ -117,8 +117,8 @@ RUN wget https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/opensh
sudo tar -C /usr/bin/ -xvzf /tmp/openshift-client-linux.tar.gz oc && rm /tmp/openshift-client-linux.tar.gz

# Helm CLI setup
RUN wget https://get.helm.sh/helm-v3.14.3-linux-amd64.tar.gz -P /tmp && \
sudo tar -C /usr/bin/ -zxvf /tmp/helm-v3.14.3-linux-amd64.tar.gz linux-amd64/helm --strip-components 1 && rm /tmp/helm-v3.14.3-linux-amd64.tar.gz
RUN wget https://get.helm.sh/helm-v3.15.2-linux-amd64.tar.gz -P /tmp && \
sudo tar -C /usr/bin/ -zxvf /tmp/helm-v3.15.2-linux-amd64.tar.gz linux-amd64/helm --strip-components 1 && rm /tmp/helm-v3.15.2-linux-amd64.tar.gz

# Python setup
RUN sudo update-alternatives --install /usr/local/bin/python python $(which python3) 1 && \
Expand Down
66 changes: 33 additions & 33 deletions .ci/jenkins/Jenkinsfile.ci-main
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,63 @@ pipeline {
}

environment {
BUILD_IMAGE_TAG = 'latest'
BUILD_IMAGE_JOB_STATUS = 'SKIPPED'
DOCKER_CONFIG = "${WORKSPACE}/.docker"
}

stages {
stage('Load local shared scripts') {
steps {
script {
dockerUtils = load '.ci/jenkins/shared-scripts/dockerUtils.groovy'
pipelineVars = load '.ci/jenkins/shared-scripts/pipelineVars.groovy'
githubUtils = load '.ci/jenkins/shared-scripts/githubUtils.groovy'
}
}
}

stage('Checkout Apache KIE Tools (Simulated squashed merge)') {
stage('Clean workspace before build') {
steps {
cleanWs(deleteDirs: true, disableDeferredWipeout: true)
}
}

stage('Checkout kie-tools') {
steps {
dir('kie-tools') {
checkout scm
}
}
}

stage('Check KIE Tools CI Image build is required') {
steps {
dir('kie-tools') {
script {
githubUtils.checkoutRepoSquashedMerge(
env.CHANGE_AUTHOR,
env.CHANGE_BRANCH,
"https://github.com/${env.CHANGE_AUTHOR}/${pipelineVars.githubRepositoryName}.git",
env.CHANGE_TARGET ?: env.BRANCH_NAME,
"https://github.com/${pipelineVars.githubRepositoryOrg}/${pipelineVars.githubRepositoryName}.git",
"${pipelineVars.kieToolsBotGithubCredentialsId}"
BUILD_IMAGE_REQUIRED = (
githubUtils.fileIsInChangeset("${env.BRANCH_NAME}", 'incubator-kie-tools-ci-build.Dockerfile')
|| !dockerUtils.checkImageExistsInRegistry(
"${pipelineVars.kieToolsCiBuildImageRegistry}",
"${pipelineVars.kieToolsCiBuildImageAccount}",
"${pipelineVars.kieToolsCiBuildImageName}",
"${env.BRANCH_NAME}",
"${pipelineVars.dockerHubUserCredentialsId}",
"${pipelineVars.dockerHubTokenCredentialsId}"
)
)

BUILD_IMAGE_REQUIRED = githubUtils.fileIsInChangeset('incubator-kie-tools-ci-build.Dockerfile')
}
}
}
}

stage('Image Build') {
stage('Trigger KIE Tools CI image build job') {
when {
expression { BUILD_IMAGE_REQUIRED }
}
steps {
script {
BUILD_IMAGE_TAG = "${env.GIT_COMMIT}"
BUILD_IMAGE_JOB_STATUS = build(
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-image-build/${BRANCH_NAME}",
parameters: [
string(name: 'IMAGE_TAG', value: "${env.GIT_COMMIT}")
]
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-image-build/${BRANCH_NAME}"
).result
}
}
Expand All @@ -87,10 +99,7 @@ pipeline {
steps {
script {
build(
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-build/${BRANCH_NAME}",
parameters: [
string(name: 'IMAGE_TAG', value: "${BUILD_IMAGE_TAG}")
]
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-build/${BRANCH_NAME}"
)
}
}
Expand All @@ -100,10 +109,7 @@ pipeline {
steps {
script {
build(
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-dependencies/${BRANCH_NAME}",
parameters: [
string(name: 'IMAGE_TAG', value: "${BUILD_IMAGE_TAG}")
]
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-dependencies/${BRANCH_NAME}"
)
}
}
Expand All @@ -113,10 +119,7 @@ pipeline {
steps {
script {
build(
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-code-formatting/${BRANCH_NAME}",
parameters: [
string(name: 'IMAGE_TAG', value: "${BUILD_IMAGE_TAG}")
]
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-code-formatting/${BRANCH_NAME}"
)
}
}
Expand All @@ -126,10 +129,7 @@ pipeline {
steps {
script {
build(
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-code-quality/${BRANCH_NAME}",
parameters: [
string(name: 'IMAGE_TAG', value: "${BUILD_IMAGE_TAG}")
]
job: "KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-code-quality/${BRANCH_NAME}"
)
}
}
Expand Down
Loading

0 comments on commit 92e2141

Please sign in to comment.