summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gheorghiu <andrei.gheorghiu@enea.com>2017-12-05 13:09:59 +0100
committerAndrei Gheorghiu <andrei.gheorghiu@enea.com>2017-12-05 13:09:59 +0100
commit7dcd1ec7c02cbd16712f92e337314fc6f43192a7 (patch)
treed5556f226a625f7fca673150322b0284132a35b8
parentce181781b3388cc58d22a677da5c314b744b2a76 (diff)
downloadel_manifests-standard-7dcd1ec7c02cbd16712f92e337314fc6f43192a7.tar.gz
Changed Jenkinsfile and added PROFILE to eltf.conf
-rw-r--r--Jenkinsfile17
-rw-r--r--eltf.conf1
2 files changed, 4 insertions, 14 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 4de9ef1..9ae9f8b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,21 +1,10 @@
1#!/bin/env groovy 1#!/bin/env groovy
2 2
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
5MANIFEST_REPOSITORY = scm.getUserRemoteConfigs()[0].getUrl() 5MANIFEST_REPOSITORY = scm.getUserRemoteConfigs()[0].getUrl()
6
7IS_CI = false
8
9def git_repo = MANIFEST_REPOSITORY.trim().split('/')[-1]
10def git_repo_name = git_repo.replace('.git','')
11env.PROFILE = git_repo_name.split('-')[-1]
12BRANCH = env.BRANCH_NAME 6BRANCH = env.BRANCH_NAME
13 7
14fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') { 8fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') {
15 fileLoader.load('freeze_manifest.groovy'); 9 fileLoader.load('eltf-jenkins03');
16}
17
18fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') {
19 fileLoader.load('eltf_pipeline.groovy');
20} 10}
21
diff --git a/eltf.conf b/eltf.conf
index b9d530b..c704309 100644
--- a/eltf.conf
+++ b/eltf.conf
@@ -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
10PROFILE=standard
10DELETE_SSTATE=NO 11DELETE_SSTATE=NO
11BOOTING_METHOD=NFS 12BOOTING_METHOD=NFS
12TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script 13TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script