From 16d501cf24ed7f962c1b555dcaeca0f7cb9bdbb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 29 Oct 2018 22:30:13 +0100
Subject: [PATCH] ci: update interop/js-api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
---
 ci/Jenkinsfile | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
index 595f7e6abb9..f194910b9e9 100644
--- a/ci/Jenkinsfile
+++ b/ci/Jenkinsfile
@@ -29,8 +29,8 @@ def build_platforms = [
 ]
 
 /* js-* tests */
-def js_api_commit = 'e61155ae8edaee902cb3a1dcd8ba3d3afb093d1c' // 24.0.1
-def interop_commit = '6593ccdca5d7b4c747787f71f7ac4b5f6f1ab10b'
+def js_api_commit = '7543c06a1105f6de4fe7c549790d58ac4cf75326' // 25.0.0 - log pr
+def interop_commit = 'e63c532e58af7b6d9924f4ebdbdc26cc317c15e5'
 
 def js_api_platforms = ['linux', 'macos']
 def js_api_node_versions = ['8.11.3', '10.4.1']
@@ -128,8 +128,6 @@ def jsTestStep = { os, nodeVer, repo, commit ->
         dir('.js-test') {
           checkout changelog: false, scm: [$class: 'GitSCM', branches: [[name: commit]], userRemoteConfigs: [[url: repo]]]
 
-          //todo: deduplicate with https://github.com/ipfs/jenkins-libs/blob/master/vars/javascript.groovy somehow
-
           fileExists 'package.json'
           nodejs(nodeVer) {
             sh 'rm -rf node_modules/'
@@ -279,21 +277,11 @@ ansiColor('xterm') { withEnv(['TERM=xterm-color']) {
     )
   }
 
-  //reportedStage('interop') {
-  //  def steps = [:]
-  //  js_api_platforms.each {os ->
-  //    js_api_node_versions.each { nodeVer ->
-  //      steps["interop-${os}-${nodeVer}"] = jsTestStep(os, nodeVer, 'https://github.com/ipfs/interop', interop_commit)
-  //    }
-  //  }
-  //
-  //  parallel steps
-  //}
-
-  reportedStage('apis') {
+  reportedStage('interop/apis') {
     def steps = [:]
     js_api_platforms.each {os ->
       js_api_node_versions.each { nodeVer ->
+        steps["interop-${os}-${nodeVer}"] = jsTestStep(os, nodeVer, 'https://github.com/ipfs/interop', interop_commit)
         steps["js-api-${os}-${nodeVer}"] = jsTestStep(os, nodeVer, 'https://github.com/ipfs/js-ipfs-api', js_api_commit)
       }
     }