Fix omec-container-remote pipeline to run new job naming scheme

Change-Id: I01e08b26f5a0f2e20386f5a4a6c5d9e64e72966d
diff --git a/jjb/pipeline/omec-container-remote.groovy b/jjb/pipeline/omec-container-remote.groovy
index 81c3c72..d70e0e8 100644
--- a/jjb/pipeline/omec-container-remote.groovy
+++ b/jjb/pipeline/omec-container-remote.groovy
@@ -22,8 +22,10 @@
       steps {
         withCredentials([string(credentialsId: 'aether-jenkins-remote-trigger-token-omec', variable: 'token')]) {
           script {
-            def handle = triggerRemoteJob job: "${params.project}_premerge_${params.pod}_4g_bess",
+            def handle = triggerRemoteJob job: "${params.project}_premerge_${params.pod}_4g_bess_${params.ghprbTargetBranch}",
                          parameters: """
+                                     sdcore_version=${params.ghprbTargetBranch}
+                                     aether_version=${params.ghprbTargetBranch}
                                      ghprbTargetBranch=${params.ghprbTargetBranch}
                                      ghprbPullId=${params.ghprbPullId}
                                      ghprbActualCommit=${params.ghprbActualCommit}
@@ -40,7 +42,7 @@
     always {
       // Copy artifacts from the remote job dir (make sure both jobs run on the same node)
       sh """
-      cp -r ../${params.project}_premerge_${params.pod}_4g_bess/* ./
+      cp -r ../${params.project}_premerge_${params.pod}_4g_bess_${params.ghprbTargetBranch}/* ./
       """
       archiveArtifacts artifacts: "**/*.*", allowEmptyArchive: true
     }