changed Jenkinsfile to run on eltf-jenkins03 and added PROFILE to eltf.conf for easier management

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 @@
 // 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','')
-def profile_name = git_repo_name.split('-')
-def result = '';
-for (i = 1; i < profile_name.length; i++) {
-    if (i != 1) {
-        result += '-' + profile_name[i]
-    } else {
-        result += profile_name[i]
-    }
-}
-
-PROFILE = result
 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/Jenkinsfile.bak b/Jenkinsfile.bak
new file mode 100644
index 0000000..99796df
--- /dev/null
+++ b/Jenkinsfile.bak
@@ -0,0 +1,30 @@
+#!/bin/env groovy
+
+// 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','')
+def profile_name = git_repo_name.split('-')
+def result = '';
+for (i = 1; i < profile_name.length; i++) {
+    if (i != 1) {
+        result += '-' + profile_name[i]
+    } else {
+        result += profile_name[i]
+    }
+}
+
+PROFILE = result
+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');
+}
diff --git a/eltf.conf b/eltf.conf
index 951556b..74be25b 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=nfv-access
 DELETE_SSTATE=NO
 BOOTING_METHOD=NFS
 TEST_PACKAGE=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script