From 50af47e74b2ffc691ebac07623cebc8eefc3e650 Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Mon, 6 Nov 2023 10:18:44 +0100
Subject: [PATCH] Added trigger_jenkins_build job to the pipeline.
---
.gitlab-ci.yml | 14 ++++++++++++++
Jenkinsfile | 20 --------------------
2 files changed, 14 insertions(+), 20 deletions(-)
delete mode 100644 Jenkinsfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ecc1e241..461a7432 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ stages:
- tox
- documentation
- sonarqube
+ - trigger_jenkins_build
include:
- docs/.gitlab-ci.yml
@@ -55,3 +56,16 @@ sonarqube:
- sonar-scanner -Dsonar.login=$SONAR_TOKEN -Dproject.settings=./sonar.properties
tags:
- docker-executor
+
+trigger_jenkins_build:
+ stage: trigger_jenkins_build
+ image: alpine:latest
+ before_script:
+ - apk add --no-cache curl
+ script: curl -u "$JENKINS_USERNAME:$JENKINS_API_TOKEN"
+ --data "PROJECT=geant-service-orchestrator"
+ "http://test-swd-release-service01.geant.org:8080/job/build-python-snapshot/buildWithParameters"
+ only:
+ - develop
+ tags:
+ - docker-executor
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 6d5a7cc7..00000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,20 +0,0 @@
-// https://gitlab.geant.net/live-projects/jenkins-pipeline/-/tree/master/vars
-library 'SWDPipeline'
-
-// Parameters:
-// name (must match the name of the project in GitLab/SWD release jenkins)
-String name = 'geant-service-orchestrator'
-
-// emails of people to always notify on build status changes
-List<String> extraRecipients = ['erik.reid@geant.org']
-
-// python versions (docker tags) to test against, must be explicit versions
-List<String> pythonTestVersions = ['3.11']
-
-// Environment variables you want to pass
-Map<String, String> appEnvironmentVariables = [
- 'SKIP_ALL_TESTS': '1',
- // add more as needed
-]
-
-SimplePythonBuild(name, extraRecipients, pythonTestVersions, appEnvironmentVariables)
--
GitLab