diff options
author | Andrei Gheorghiu <andrei.gheorghiu@enea.com> | 2017-11-29 13:33:06 +0100 |
---|---|---|
committer | Andrei Gheorghiu <andrei.gheorghiu@enea.com> | 2017-11-29 13:33:06 +0100 |
commit | 9e678d437fcce9f0d0ac3b16e81b95271e624a44 (patch) | |
tree | 7c884e27f2db586362b918d237705bcd263d2ae3 | |
parent | adac8cc78550df769cf4472349c85eb835ec4050 (diff) | |
download | el_manifests-nfv-access-9e678d437fcce9f0d0ac3b16e81b95271e624a44.tar.gz |
changed Jenkinsfile to run on eltf-jenkins03 and added PROFILE to eltf.conf for easier management
-rw-r--r-- | Jenkinsfile | 22 | ||||
-rw-r--r-- | Jenkinsfile.bak | 30 | ||||
-rw-r--r-- | eltf.conf | 1 |
3 files changed, 32 insertions, 21 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 99796df..9ae9f8b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile | |||
@@ -3,28 +3,8 @@ | |||
3 | // This script is used internally by Enea for automated tests on Linux builds | 3 | // This script is used internally by Enea for automated tests on Linux builds |
4 | 4 | ||
5 | MANIFEST_REPOSITORY = scm.getUserRemoteConfigs()[0].getUrl() | 5 | MANIFEST_REPOSITORY = scm.getUserRemoteConfigs()[0].getUrl() |
6 | |||
7 | IS_CI = false | ||
8 | |||
9 | def git_repo = MANIFEST_REPOSITORY.trim().split('/')[-1] | ||
10 | def git_repo_name = git_repo.replace('.git','') | ||
11 | def profile_name = git_repo_name.split('-') | ||
12 | def result = ''; | ||
13 | for (i = 1; i < profile_name.length; i++) { | ||
14 | if (i != 1) { | ||
15 | result += '-' + profile_name[i] | ||
16 | } else { | ||
17 | result += profile_name[i] | ||
18 | } | ||
19 | } | ||
20 | |||
21 | PROFILE = result | ||
22 | BRANCH = env.BRANCH_NAME | 6 | BRANCH = env.BRANCH_NAME |
23 | 7 | ||
24 | fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') { | 8 | fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') { |
25 | fileLoader.load('freeze_manifest.groovy'); | 9 | fileLoader.load('eltf-jenkins03'); |
26 | } | ||
27 | |||
28 | fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') { | ||
29 | fileLoader.load('eltf_pipeline.groovy'); | ||
30 | } | 10 | } |
diff --git a/Jenkinsfile.bak b/Jenkinsfile.bak new file mode 100644 index 0000000..99796df --- /dev/null +++ b/Jenkinsfile.bak | |||
@@ -0,0 +1,30 @@ | |||
1 | #!/bin/env groovy | ||
2 | |||
3 | // This script is used internally by Enea for automated tests on Linux builds | ||
4 | |||
5 | MANIFEST_REPOSITORY = scm.getUserRemoteConfigs()[0].getUrl() | ||
6 | |||
7 | IS_CI = false | ||
8 | |||
9 | def git_repo = MANIFEST_REPOSITORY.trim().split('/')[-1] | ||
10 | def git_repo_name = git_repo.replace('.git','') | ||
11 | def profile_name = git_repo_name.split('-') | ||
12 | def result = ''; | ||
13 | for (i = 1; i < profile_name.length; i++) { | ||
14 | if (i != 1) { | ||
15 | result += '-' + profile_name[i] | ||
16 | } else { | ||
17 | result += profile_name[i] | ||
18 | } | ||
19 | } | ||
20 | |||
21 | PROFILE = result | ||
22 | BRANCH = env.BRANCH_NAME | ||
23 | |||
24 | fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') { | ||
25 | fileLoader.load('freeze_manifest.groovy'); | ||
26 | } | ||
27 | |||
28 | fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') { | ||
29 | fileLoader.load('eltf_pipeline.groovy'); | ||
30 | } | ||
@@ -7,6 +7,7 @@ | |||
7 | # BOOTING_METHOD=NFS/RAM/etc | 7 | # BOOTING_METHOD=NFS/RAM/etc |
8 | # TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script | 8 | # TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script |
9 | # IMAGE_TYPES=enea-image-${PROFILE},enea-image-${PROFILE}-sdk,world | 9 | # IMAGE_TYPES=enea-image-${PROFILE},enea-image-${PROFILE}-sdk,world |
10 | PROFILE=nfv-access | ||
10 | DELETE_SSTATE=NO | 11 | DELETE_SSTATE=NO |
11 | BOOTING_METHOD=NFS | 12 | BOOTING_METHOD=NFS |
12 | TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script | 13 | TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script |