Skip to content

Commit af2b38d

Browse files
Remove requirements.txt and update Jenkinsfile again
1 parent 8a69c54 commit af2b38d

File tree

3 files changed

+16
-21
lines changed

3 files changed

+16
-21
lines changed

Jenkinsfile

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,33 @@
1+
library 'sp-jenkins'
2+
13
pipeline {
24
agent any
5+
environment {
6+
BUILD_WORKDIR = "/tmp/${env.BUILD_TAG}/"
7+
}
38
stages {
49
stage('build') {
510
when {
611
anyOf {
712
branch 'master'
813
branch 'production'
914
branch 'release_candidate'
10-
buildingTag()
1115
changeRequest title: ".*JENKINSFILE_TESTING.*", comparator: 'REGEXP'
16+
buildingTag()
1217
}
1318
}
14-
parallel {
15-
stage('build_trusty') {
16-
steps {
17-
awsCodeBuild projectName: 'build_trusty_python_library',
18-
envVariables: '[ { RUN_TESTS, false }, { CREATE_SDIST, true }, {pip_version, pip3.8} ]',
19-
region: 'us-east-1',
20-
sourceControlType: 'jenkins',
21-
credentialsType: 'keys'
22-
}
23-
}
24-
stage('build_bionic') {
2519
steps {
26-
awsCodeBuild projectName: 'build_bionic_python_library',
27-
envVariables: '[ { RUN_TESTS, false }, {pip_version, pip3.8}, { CREATE_SDIST, true } ]',
28-
region: 'us-east-1',
29-
sourceControlType: 'jenkins',
30-
credentialsType: 'keys'
20+
publishWheels codeBuildEnv: '[{ requirements, requirements/default.txt }, { RUN_TESTS, false }, { pip_version, pip3.8 } ]'
3121
}
32-
}
33-
}
22+
}
23+
}
24+
post {
25+
cleanup {
26+
echo "Deleting working directory ${env.BUILD_WORKDIR}"
27+
sh 'rm -rf $BUILD_WORKDIR'
28+
}
29+
always {
30+
buildNotification()
3431
}
3532
}
3633
}

requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements/default.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
celery>=4.0,<5.0
22
django-timezone-field>=4.2,<5.0
33
python-crontab>=2.3.4
4-
django>=2.2,<4

0 commit comments

Comments
 (0)