From 022511d5fcab88bb56030b384de640524bbb64af Mon Sep 17 00:00:00 2001 From: Karel van Klink <karel.vanklink@geant.org> Date: Thu, 9 Nov 2023 15:25:17 +0100 Subject: [PATCH] add Jenkins build to gitlab CI pipeline --- .gitlab-ci.yml | 14 ++++++++++++++ Jenkinsfile | 13 ------------- 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 Jenkinsfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8992eb..e2b511e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ stages: - tox - documentation + - trigger_jenkins_build include: - docs/.gitlab-ci.yml @@ -40,3 +41,16 @@ run-tox-pipeline: paths: - htmlcov - docs/source/_static/openapi.json + +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=goat-lso" + "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 53347bd..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,13 +0,0 @@ -library 'SWDPipeline' - -// Parameters: -// name (must match the name of the project in GitLab/SWD release jenkins) -String name = 'goat-lso' - -// 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'] - -SimplePythonBuild(name, extraRecipients, pythonTestVersions) -- GitLab