From 2a4a535f9c51f28b70a3be05599a76a1bd02de31 Mon Sep 17 00:00:00 2001
From: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Date: Mon, 20 Nov 2023 13:49:20 +0200
Subject: [PATCH 1/3] Update Jenkinsfile
---
Jenkinsfile | 479 +++++++++++++++++++++++++++++++---------------------
1 file changed, 287 insertions(+), 192 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6b08b4a96..4f6338edd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,98 +1,160 @@
-def gitBranch = env.BRANCH_NAME
-def imageName = "memphis"
-def gitURL = "git@github.com:Memphisdev/memphis.git"
-def repoUrlPrefix = "memphisos"
-def test_suffix = "test"
String unique_id = org.apache.commons.lang.RandomStringUtils.random(4, false, true)
-node {
- git credentialsId: 'main-github', url: gitURL, branch: gitBranch
- def versionTag = readFile "./version.conf"
-
- try{
-
+pipeline {
+ environment {
+ versionTag= readFile('./version.conf')
+ gitBranch = "${env.BRANCH_NAME}"
+ imageName = "memphis"
+ repoUrlPrefix = "memphisos"
+ test_suffix = "test"
+ }
+
+ agent any
+ stages {
stage('Login to Docker Hub') {
- withCredentials([usernamePassword(credentialsId: 'docker-hub', usernameVariable: 'DOCKER_HUB_CREDS_USR', passwordVariable: 'DOCKER_HUB_CREDS_PSW')]) {
- sh 'docker login -u $DOCKER_HUB_CREDS_USR -p $DOCKER_HUB_CREDS_PSW'
- }
- }
-/*
- stage('UI build'){
- dir ('ui_src'){
- sh """
- npm install
- CI=false npm run build
- """
- }
+ steps {
+ withCredentials([usernamePassword(credentialsId: 'docker-hub', usernameVariable: 'DOCKER_HUB_CREDS_USR', passwordVariable: 'DOCKER_HUB_CREDS_PSW')]) {
+ sh 'docker login -u $DOCKER_HUB_CREDS_USR -p $DOCKER_HUB_CREDS_PSW'
+ }
+ }
}
-*/
+
stage('Create memphis namespace in Kubernetes'){
- sh """
- kubectl config use-context minikube
- kubectl create namespace memphis-$unique_id --dry-run=client -o yaml | kubectl apply -f -
- aws s3 cp s3://memphis-jenkins-backup-bucket/regcred.yaml .
- kubectl apply -f regcred.yaml -n memphis-$unique_id
- kubectl patch serviceaccount default -p '{\"imagePullSecrets\": [{\"name\": \"regcred\"}]}' -n memphis-$unique_id
- """
+ steps {
+ sh """
+ kubectl config use-context minikube
+ kubectl create namespace memphis-$unique_id --dry-run=client -o yaml | kubectl apply -f -
+ aws s3 cp s3://memphis-jenkins-backup-bucket/regcred.yaml .
+ kubectl apply -f regcred.yaml -n memphis-$unique_id
+ kubectl patch serviceaccount default -p '{\"imagePullSecrets\": [{\"name\": \"regcred\"}]}' -n memphis-$unique_id
+ """
+ }
}
stage('Build and push docker image to Docker Hub') {
- sh "docker buildx build --push --tag ${repoUrlPrefix}/${imageName}-${gitBranch} --platform linux/amd64,linux/arm64 ."
+ steps {
+ sh "docker buildx build --push --tag ${repoUrlPrefix}/${imageName}-${gitBranch} --platform linux/amd64,linux/arm64 ."
+ }
+ }
+
+ stage('Tests - Install/upgrade Memphis cli - BETA') {
+ when { anyOf { branch 'master'; branch 'qa'; branch 'valera'}}
+ steps {
+ sh """
+ sudo npm uninstall memphis-dev-cli-beta -g
+ sudo npm i memphis-dev-cli-beta -g --force
+ """
+ }
}
- stage('Tests - Install/upgrade Memphis cli') {
- if (env.BRANCH_NAME ==~ /(master)/) {
- sh """
- sudo npm uninstall memphis-dev-cli-beta -g
- sudo npm i memphis-dev-cli-beta -g --force
- """
- }
- else {
- sh """
- sudo npm uninstall memphis-dev-cli -g
- sudo npm i memphis-dev-cli -g
- """
- }
+ stage('Tests - Install/upgrade Memphis cli - LATEST') {
+ when { branch 'latest' }
+ steps {
+ sh """
+ sudo npm uninstall memphis-dev-cli -g
+ sudo npm i memphis-dev-cli -g
+ """
+ }
}
+
+
////////////////////////////////////////
//////////// Docker-Compose ////////////
////////////////////////////////////////
stage('Tests - Docker compose install') {
- sh "rm -rf memphis-docker"
- dir ('memphis-devops'){
- git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-devops.git', branch: 'master'
- }
- if (env.BRANCH_NAME ==~ /(latest)/) {
- sh "docker-compose -f ./memphis-devops/docker/docker-compose-latest-tests-broker.yml -p memphis up -d"
- }
- if (env.BRANCH_NAME ==~ /(master)/) {
- sh "docker-compose -f ./memphis-devops/docker/docker-compose-master-tests-broker.yml -p memphis up -d"
- }
+ when { branch 'master' }
+ steps {
+ sh "rm -rf memphis-docker"
+ dir ('memphis-devops'){
+ git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-devops.git', branch: 'master'
+ }
+ sh "docker-compose -f ./memphis-devops/docker/docker-compose-master-tests-broker.yml -p memphis up -d"
+ }
+ }
+ stage('Tests - Docker compose install') {
+ when { branch 'qa' }
+ steps {
+ sh "rm -rf memphis-docker"
+ dir ('memphis-devops'){
+ git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-devops.git', branch: 'master'
+ }
+ sh "docker-compose -f ./memphis-devops/docker/docker-compose-qa-tests-broker.yml -p memphis up -d"
+ }
}
+ stage('Tests - Docker compose install') {
+ when { branch 'valera' }
+ steps {
+ sh "rm -rf memphis-docker"
+ dir ('memphis-devops'){
+ git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-devops.git', branch: 'master'
+ }
+ sh "docker-compose -f ./memphis-devops/docker/docker-compose-master-tests-broker.yml -p memphis up -d"
+ }
+ }
+
+
+ stage('Tests - Docker compose install') {
+ when { branch 'latest' }
+ steps {
+ sh "rm -rf memphis-docker"
+ dir ('memphis-devops'){
+ git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-devops.git', branch: 'master'
+ }
+ sh "docker-compose -f ./memphis-devops/docker/docker-compose-latest-tests-broker.yml -p memphis up -d"
+ }
+ }
+
+
stage('Tests - Run e2e tests over Docker') {
- sh "rm -rf memphis-e2e-tests"
- dir ('memphis-e2e-tests'){
- git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-e2e-tests.git', branch: 'master'
- }
- sh "npm install --prefix ./memphis-e2e-tests"
- sh "node ./memphis-e2e-tests/index.js docker"
+ steps {
+ sh "rm -rf memphis-e2e-tests"
+ dir ('memphis-e2e-tests'){
+ git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-e2e-tests.git', branch: 'master'
+ }
+ sh "npm install --prefix ./memphis-e2e-tests"
+ sh "node ./memphis-e2e-tests/index.js docker"
+ }
+ }
+
+ stage('Tests - Remove Docker compose') {
+ when { branch 'master' }
+ steps {
+ sh """
+ docker-compose -f ./memphis-docker/docker-compose-master-tests-broker.yml -p memphis down
+ docker volume prune -f
+ """
+ }
+ }
+ stage('Tests - Remove Docker compose') {
+ when { branch 'qa' }
+ steps {
+ sh """
+ docker-compose -f ./memphis-docker/docker-compose-qa-tests-broker.yml -p memphis down
+ docker volume prune -f
+ """
+ }
+ }
+
+ stage('Tests - Remove Docker compose') {
+ when { branch 'valera' }
+ steps {
+ sh """
+ docker-compose -f ./memphis-docker/docker-compose-master-tests-broker.yml -p memphis down
+ docker volume prune -f
+ """
+ }
}
stage('Tests - Remove Docker compose') {
- if (env.BRANCH_NAME ==~ /(latest)/) {
- sh """
- docker-compose -f ./memphis-devops/docker/docker-compose-latest-tests-broker.yml -p memphis down
- docker volume prune -f
- """
- }
- if (env.BRANCH_NAME ==~ /(master)/) {
- sh """
- docker-compose -f ./memphis-devops/docker/docker-compose-master-tests-broker.yml -p memphis down
- docker volume prune -f
- """
- }
+ when { branch 'latest' }
+ steps {
+ sh """
+ docker-compose -f ./memphis-docker/docker-compose-latest-tests-broker.yml -p memphis down
+ docker volume prune -f
+ """
+ }
}
////////////////////////////////////////
@@ -100,170 +162,203 @@ node {
////////////////////////////////////////
stage('Tests - Install memphis with helm') {
- sh "rm -rf memphis-k8s"
- dir ('memphis-k8s'){
- git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-k8s.git', branch: gitBranch
- sh """
- helm install memphis-tests memphis --set memphis.extraEnvironmentVars.enabled=true,memphis.image=${repoUrlPrefix}/${imageName}-${gitBranch} --set-json 'memphis.extraEnvironmentVars.vars=[{"name":"ENV","value":"staging"}]' --create-namespace --namespace memphis-$unique_id --wait
- """
- }
+ steps {
+ dir ('memphis-k8s'){
+ git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-k8s.git', branch: 'master'
+ sh """
+ helm install memphis-tests memphis --set memphis.extraEnvironmentVars.enabled=true,memphis.image=${repoUrlPrefix}/${imageName}-${gitBranch} --set-json 'memphis.extraEnvironmentVars.vars=[{"name":"ENV","value":"staging"}]' --create-namespace --namespace memphis-$unique_id --wait
+ """
+ }
+ }
}
stage('Open port forwarding to memphis service') {
- sh """
- until kubectl get pods --selector=app.kubernetes.io/name=memphis -o=jsonpath="{.items[*].status.phase}" -n memphis-$unique_id | grep -q "Running" ; do sleep 1; done
- nohup kubectl port-forward service/memphis 6666:6666 9000:9000 7770:7770 --namespace memphis-$unique_id &
- """
+ steps {
+ sh """
+ until kubectl get pods --selector=app.kubernetes.io/name=memphis -o=jsonpath="{.items[*].status.phase}" -n memphis-$unique_id | grep -q "Running" ; do sleep 1; done
+ nohup kubectl port-forward service/memphis 6666:6666 9000:9000 7770:7770 --namespace memphis-$unique_id &
+ """
+ }
}
stage('Tests - Run e2e tests over kubernetes') {
- sh """
- npm install --prefix ./memphis-e2e-tests
- node ./memphis-e2e-tests/index.js kubernetes memphis-$unique_id
- """
+ steps {
+ sh """
+ npm install --prefix ./memphis-e2e-tests
+ node ./memphis-e2e-tests/index.js kubernetes memphis-$unique_id
+ """
+ }
}
stage('Tests - Uninstall helm') {
- sh """
- helm uninstall memphis-tests -n memphis-$unique_id
- kubectl delete ns memphis-$unique_id &
- /usr/sbin/lsof -i :6666,9000 | grep kubectl | awk '{print \"kill -9 \"\$2}' | sh
- """
+ steps {
+ sh """
+ helm uninstall memphis-tests -n memphis-$unique_id
+ kubectl delete ns memphis-$unique_id &
+ /usr/sbin/lsof -i :6666,9000 | grep kubectl | awk '{print \"kill -9 \"\$2}' | sh
+ """
+ }
}
////////////////////////////////////////
//////////// Build & Push ////////////
////////////////////////////////////////
-
-
- stage('Build and push image to Docker Hub') {
- sh "docker buildx use builder"
- if (env.BRANCH_NAME ==~ /(latest)/) {
- if(versionTag.contains('stable')) {
- sh "docker buildx build --push --tag ${repoUrlPrefix}/${imageName}:${versionTag} --tag ${repoUrlPrefix}/${imageName}:stable --tag ${repoUrlPrefix}/${imageName} --platform linux/amd64,linux/arm64 ."
- }
- else{
- sh "docker buildx build --push --tag ${repoUrlPrefix}/${imageName}:${versionTag} --tag ${repoUrlPrefix}/${imageName} --platform linux/amd64,linux/arm64 ."
- }
- }
+
+ stage('Build and push image to Docker Hub - LATEST') {
+ when { branch 'latest' }
+ steps {
+ sh """
+ docker buildx build --push --tag ${repoUrlPrefix}/${imageName}:${versionTag} --tag ${repoUrlPrefix}/${imageName} --platform linux/amd64,linux/arm64 .
+ """
+ }
}
-
//////////////////////////////////////
- ////////////// MASTER //////////////
+ //////////// K8's Tests ////////////
//////////////////////////////////////
- if (env.BRANCH_NAME ==~ /(master)/) {
- stage('Push to staging'){
- sh """
- aws eks --region eu-central-1 update-kubeconfig --name staging-cluster
- helm uninstall my-memphis --kubeconfig ~/.kube/config -n memphis
- kubectl get pvc -n memphis | grep -v NAME| awk '{print\$1}' | while read vol; do kubectl delete pvc \$vol -n memphis; done
- """
- dir ('memphis-k8s'){
- git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-k8s.git', branch: gitBranch
- sh """
- aws s3 cp s3://memphis-jenkins-backup-bucket/memphis-staging-oss.yaml .
- helm install my-memphis memphis --set global.cluster.enabled="true",websocket.tls.cert="tls.crt",websocket.tls.key="tls.key",websocket.tls.secret.name="ws-tls-certs" -f ./memphis-staging-oss.yaml --create-namespace --namespace memphis --wait
- """
- }
+ stage('Reset STG-OSS environment') {
+ when { not {branch 'latest'}}
+ steps {
+ sh """
+ aws eks --region eu-central-1 update-kubeconfig --name staging-cluster
+ helm uninstall my-memphis --kubeconfig ~/.kube/config -n memphis
+ kubectl get pvc -n memphis | grep -v NAME| awk '{print\$1}' | while read vol; do kubectl delete pvc \$vol -n memphis; done
+ """
+ }
+ }
+
+ stage('Push to STG-OSS') {
+ when { not {branch 'latest'}}
+ steps {
+ dir ('memphis-k8s'){
+ git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-k8s.git', branch: 'master'
+ sh """
+ aws s3 cp s3://memphis-jenkins-backup-bucket/memphis-staging-oss.yaml .
+ helm install my-memphis memphis --set memphis.image=${repoUrlPrefix}/${imageName}-${gitBranch} -f ./memphis-staging-oss.yaml --create-namespace --namespace memphis --wait
+ """
+ }
sh "rm -rf memphis-k8s"
- }
-
- stage('Open port forwarding to memphis service') {
- sh """
- until kubectl get pods --selector=app.kubernetes.io/name=memphis -o=jsonpath="{.items[*].status.phase}" -n memphis | grep -q "Running" ; do sleep 1; done
- nohup kubectl port-forward service/memphis 6666:6666 9000:9000 7770:7770 --namespace memphis &
- """
- }
+ }
+ }
- stage('Tests - Run e2e tests over memphis cluster') {
- sh """
- npm install --prefix ./memphis-e2e-tests
- node ./memphis-e2e-tests/index.js kubernetes memphis
- """
+ stage('Open port forwarding to memphis service') {
+ when { not {branch 'latest'}}
+ steps {
+ sh """
+ until kubectl get pods --selector=app.kubernetes.io/name=memphis -o=jsonpath="{.items[*].status.phase}" -n memphis | grep -q "Running" ; do sleep 1; done
+ nohup kubectl port-forward service/memphis 6666:6666 9000:9000 7770:7770 --namespace memphis &
+ """
+ }
+ }
+
+ stage('Tests - Run e2e tests over kubernetes') {
+ when { not {branch 'latest'}}
+ steps {
+ sh """
+ npm install --prefix ./memphis-e2e-tests
+ node ./memphis-e2e-tests/index.js kubernetes memphis
+ """
}
+ }
- stage('Install memphis CLI') {
- sh """
- sudo npm i memphis-dev-cli -g
- """
+ stage('Install memphis CLI') {
+ when { not {branch 'latest'}}
+ steps {
+ sh """
+ sudo npm i memphis-dev-cli -g
+ """
}
+ }
stage('Create staging user') {
- withCredentials([string(credentialsId: 'staging_pass', variable: 'staging_pass')]) {
- sh '''
- mem connect -s localhost -u root -p \$(kubectl get secret memphis-creds -n memphis -o jsonpath="{.data.ROOT_PASSWORD}" | base64 --decode)
- mem user add -u staging -p $staging_pass
- /usr/sbin/lsof -i :6666,9000 | grep kubectl | awk '{print \"kill -9 \"\$2}' | sh
- '''
- }
+ when { not {branch 'latest'}}
+ steps {
+ withCredentials([string(credentialsId: 'staging_pass', variable: 'staging_pass')]) {
+ sh """
+ mem connect -s localhost -u root -p \$(kubectl get secret memphis-creds -n memphis -o jsonpath="{.data.ROOT_PASSWORD}" | base64 --decode)
+ mem user add -u staging -p $staging_pass
+ /usr/sbin/lsof -i :6666,9000 | grep kubectl | awk '{print \"kill -9 \"\$2}' | sh
+ """
+ }
+ }
}
- stage('Tests - remove port-forwarding') {
- sh(script: """/usr/sbin/lsof -i :6666,9000 | grep kubectl | awk '{print \"kill -9 \"\$2}' | sh""", returnStdout: true)
+ stage('Tests - remove port-forwarding') {
+ when { not {branch 'latest'}}
+ steps {
+ sh"""
+ /usr/sbin/lsof -i :6666,9000 | grep kubectl | awk '{print \"kill -9 \"\$2}' | sh
+ """
}
+ }
- stage('Tests - Remove used directories') {
- sh "rm -rf memphis-e2e-tests"
- }
- }
+ stage('Tests - Remove used directories') {
+ when { not {branch 'latest'}}
+ steps {
+ sh "rm -rf memphis-e2e-tests"
+ }
+ }
//////////////////////////////////////////////////////////
////////////// Checkout to version branch //////////////
//////////////////////////////////////////////////////////
- if (env.BRANCH_NAME ==~ /(latest)/) {
- stage('checkout to version branch'){
- withCredentials([sshUserPrivateKey(keyFileVariable:'check',credentialsId: 'main-github')]) {
- sh """
- git reset --hard origin/latest
- GIT_SSH_COMMAND='ssh -i $check' git checkout -b ${versionTag}
- GIT_SSH_COMMAND='ssh -i $check' git push --set-upstream origin ${versionTag}
- """
- }
+ stage('checkout to version branch'){
+ when { branch 'latest' }
+ steps {
+ withCredentials([sshUserPrivateKey(keyFileVariable:'check',credentialsId: 'main-github')]) {
+ sh """
+ git reset --hard origin/latest
+ GIT_SSH_COMMAND='ssh -i $check' git checkout -b ${versionTag}
+ GIT_SSH_COMMAND='ssh -i $check' git push --set-upstream origin ${versionTag}
+ """
+ }
+ }
}
-
- stage('Install gh'){
- sh """
- sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo -y
- sudo dnf install gh -y
- """
+
+ stage('Install gh + create new release'){
+ when { branch 'latest' }
+ steps {
+ withCredentials([sshUserPrivateKey(keyFileVariable:'check',credentialsId: 'main-github')]) {
+ sh """
+ sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo -y
+ sudo dnf install gh -y
+ gh release create v${versionTag} --generate-notes
+ """
+ }
+ }
}
-
- stage('Create new release') {
- withCredentials([string(credentialsId: 'gh_token', variable: 'GH_TOKEN')]) {
- sh "gh release create v${versionTag} --generate-notes"
- }
+
+ post {
+ always {
+ cleanWs()
+ }
+ success {
+ notifySuccessful()
}
- }
-
- notifySuccessful()
- } catch (e) {
- currentBuild.result = "FAILED"
- sh(script: """docker ps | grep memphisos/ | awk '{print \"docker rm -f \"\$1}' | sh""", returnStdout: true)
- sh "docker volume prune -f"
- sh "kubectl delete ns memphis-$unique_id &"
- cleanWs()
- notifyFailed()
- throw e
+
+ failure {
+ notifyFailed()
+ }
+ }
}
}
def notifySuccessful() {
- emailext (
- subject: "SUCCESSFUL: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
- body: """SUCCESSFUL: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]':
- Check console output at "${env.JOB_NAME} [${env.BUILD_NUMBER}]"
""",
- recipientProviders: [requestor()]
+ emailext (
+ subject: "SUCCESSFUL: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
+ body: """SUCCESSFUL: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]':
+ Check console output and connection attributes at ${env.BUILD_URL}""",
+ recipientProviders: [requestor()]
)
}
def notifyFailed() {
- emailext (
- subject: "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
- body: """FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]':
- Check console output at "${env.JOB_NAME} [${env.BUILD_NUMBER}]"
""",
- recipientProviders: [requestor()]
+ emailext (
+ subject: "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
+ body: """FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]':
+ Check console output at ${env.BUILD_URL}""",
+ recipientProviders: [requestor()]
)
}
From e6ad723cdda349377fd847fc273b12604e9349a6 Mon Sep 17 00:00:00 2001
From: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Date: Mon, 20 Nov 2023 14:18:08 +0200
Subject: [PATCH 2/3] Update Jenkinsfile
---
Jenkinsfile | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4f6338edd..805f76cf6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,7 +62,7 @@ pipeline {
//////////// Docker-Compose ////////////
////////////////////////////////////////
- stage('Tests - Docker compose install') {
+ stage('Tests - Docker compose install - Master') {
when { branch 'master' }
steps {
sh "rm -rf memphis-docker"
@@ -72,7 +72,7 @@ pipeline {
sh "docker-compose -f ./memphis-devops/docker/docker-compose-master-tests-broker.yml -p memphis up -d"
}
}
- stage('Tests - Docker compose install') {
+ stage('Tests - Docker compose install - QA') {
when { branch 'qa' }
steps {
sh "rm -rf memphis-docker"
@@ -95,7 +95,7 @@ pipeline {
}
- stage('Tests - Docker compose install') {
+ stage('Tests - Docker compose install - Latest') {
when { branch 'latest' }
steps {
sh "rm -rf memphis-docker"
@@ -118,7 +118,7 @@ pipeline {
}
}
- stage('Tests - Remove Docker compose') {
+ stage('Tests - Remove Docker compose - Master') {
when { branch 'master' }
steps {
sh """
@@ -127,7 +127,7 @@ pipeline {
"""
}
}
- stage('Tests - Remove Docker compose') {
+ stage('Tests - Remove Docker compose - QA') {
when { branch 'qa' }
steps {
sh """
@@ -147,7 +147,7 @@ pipeline {
}
}
- stage('Tests - Remove Docker compose') {
+ stage('Tests - Remove Docker compose - Latest') {
when { branch 'latest' }
steps {
sh """
@@ -173,7 +173,7 @@ pipeline {
}
- stage('Open port forwarding to memphis service') {
+ stage('Open port forwarding to memphis service - Minikube') {
steps {
sh """
until kubectl get pods --selector=app.kubernetes.io/name=memphis -o=jsonpath="{.items[*].status.phase}" -n memphis-$unique_id | grep -q "Running" ; do sleep 1; done
@@ -182,7 +182,7 @@ pipeline {
}
}
- stage('Tests - Run e2e tests over kubernetes') {
+ stage('Tests - Run e2e tests over kubernetes - Minikube') {
steps {
sh """
npm install --prefix ./memphis-e2e-tests
@@ -244,7 +244,7 @@ pipeline {
}
}
- stage('Open port forwarding to memphis service') {
+ stage('Open port forwarding to memphis service - K8s') {
when { not {branch 'latest'}}
steps {
sh """
@@ -254,7 +254,7 @@ pipeline {
}
}
- stage('Tests - Run e2e tests over kubernetes') {
+ stage('Tests - Run e2e tests over kubernetes - K8s') {
when { not {branch 'latest'}}
steps {
sh """
@@ -330,8 +330,8 @@ pipeline {
"""
}
}
- }
-
+ }
+ }
post {
always {
cleanWs()
@@ -344,7 +344,6 @@ pipeline {
notifyFailed()
}
}
- }
}
def notifySuccessful() {
emailext (
From 9dd39b4a07defbe30924a68d85c54841e0dfdd6d Mon Sep 17 00:00:00 2001
From: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Date: Mon, 20 Nov 2023 15:24:27 +0200
Subject: [PATCH 3/3] Update Jenkinsfile
---
Jenkinsfile | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 805f76cf6..e62246bd2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
}
stage('Tests - Install/upgrade Memphis cli - BETA') {
- when { anyOf { branch 'master'; branch 'qa'; branch 'valera'}}
+ when { anyOf { branch 'master'; branch 'qa'}}
steps {
sh """
sudo npm uninstall memphis-dev-cli-beta -g
@@ -82,18 +82,6 @@ pipeline {
sh "docker-compose -f ./memphis-devops/docker/docker-compose-qa-tests-broker.yml -p memphis up -d"
}
}
-
- stage('Tests - Docker compose install') {
- when { branch 'valera' }
- steps {
- sh "rm -rf memphis-docker"
- dir ('memphis-devops'){
- git credentialsId: 'main-github', url: 'git@github.com:memphisdev/memphis-devops.git', branch: 'master'
- }
- sh "docker-compose -f ./memphis-devops/docker/docker-compose-master-tests-broker.yml -p memphis up -d"
- }
- }
-
stage('Tests - Docker compose install - Latest') {
when { branch 'latest' }
@@ -137,16 +125,6 @@ pipeline {
}
}
- stage('Tests - Remove Docker compose') {
- when { branch 'valera' }
- steps {
- sh """
- docker-compose -f ./memphis-docker/docker-compose-master-tests-broker.yml -p memphis down
- docker volume prune -f
- """
- }
- }
-
stage('Tests - Remove Docker compose - Latest') {
when { branch 'latest' }
steps {