From 7dcd1ec7c02cbd16712f92e337314fc6f43192a7 Mon Sep 17 00:00:00 2001 From: Andrei Gheorghiu Date: Tue, 5 Dec 2017 13:09:59 +0100 Subject: Changed Jenkinsfile and added PROFILE to eltf.conf --- Jenkinsfile | 17 +++-------------- eltf.conf | 1 + 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 @@ #!/bin/env groovy -//This script is used internally by Enea for automated tests on Linux builds +// This script is used internally by Enea for automated tests on Linux builds -MANIFEST_REPOSITORY = scm.getUserRemoteConfigs()[0].getUrl() - -IS_CI = false - -def git_repo = MANIFEST_REPOSITORY.trim().split('/')[-1] -def git_repo_name = git_repo.replace('.git','') -env.PROFILE = git_repo_name.split('-')[-1] +MANIFEST_REPOSITORY = scm.getUserRemoteConfigs()[0].getUrl() BRANCH = env.BRANCH_NAME fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') { - fileLoader.load('freeze_manifest.groovy'); -} - -fileLoader.withGit('git@git.enea.se:eltf/jenkins.git', 'master', null, '') { - fileLoader.load('eltf_pipeline.groovy'); + fileLoader.load('eltf-jenkins03'); } - diff --git a/eltf.conf b/eltf.conf index b9d530b..c704309 100644 --- a/eltf.conf +++ b/eltf.conf @@ -7,6 +7,7 @@ # BOOTING_METHOD=NFS/RAM/etc # TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script # IMAGE_TYPES=enea-image-${PROFILE},enea-image-${PROFILE}-sdk,world +PROFILE=standard DELETE_SSTATE=NO BOOTING_METHOD=NFS TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script -- cgit v1.2.3-54-g00ecf