From eccc502ef2dd1fa42d0c16afd965a21d60aa0201 Mon Sep 17 00:00:00 2001 From: Lauri Nevala Date: Fri, 13 Nov 2020 16:42:34 +0200 Subject: [PATCH] Exit pipeline if extensions build or tests fail (#1370) Signed-off-by: Lauri Nevala --- .azure-pipelines.yml | 6 ++++-- Makefile | 4 ++-- extensions/example-extension/main.ts | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 05de7c1087..1f32789f4e 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -84,6 +84,8 @@ jobs: displayName: Build bundled extensions - script: make test displayName: Run tests + - script: make test-extensions + displayName: Run In-tree Extension tests - script: make integration-mac displayName: Run integration tests - script: make test-extensions @@ -122,8 +124,6 @@ jobs: displayName: Cache Yarn packages - script: make install-deps displayName: Install dependencies - - script: make test-extensions - displayName: Run In-tree Extension tests - script: make lint displayName: Lint - script: make build-npm @@ -132,6 +132,8 @@ jobs: displayName: Build bundled extensions - script: make test displayName: Run tests + - script: make test-extensions + displayName: Run In-tree Extension tests - bash: | sudo apt-get update sudo apt-get install libgconf-2-4 conntrack -y diff --git a/Makefile b/Makefile index 434e1dd6e1..d863466422 100644 --- a/Makefile +++ b/Makefile @@ -56,10 +56,10 @@ else endif build-extensions: - $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), $(MAKE) -C $(dir) build;) + $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), $(MAKE) -C $(dir) build || exit $?; ) test-extensions: - $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), $(MAKE) -C $(dir) test;) + $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), $(MAKE) -C $(dir) test || exit $?; ) build-npm: build-extension-types yarn npm:fix-package-version diff --git a/extensions/example-extension/main.ts b/extensions/example-extension/main.ts index 2f0a926769..85f7977a83 100644 --- a/extensions/example-extension/main.ts +++ b/extensions/example-extension/main.ts @@ -2,10 +2,10 @@ import { LensMainExtension } from "@k8slens/extensions"; export default class ExampleExtensionMain extends LensMainExtension { onActivate() { - console.log('EXAMPLE EXTENSION MAIN: ACTIVATED', this.getMeta()); + console.log('EXAMPLE EXTENSION MAIN: ACTIVATED'); } onDeactivate() { - console.log('EXAMPLE EXTENSION MAIN: DEACTIVATED', this.getMeta()); + console.log('EXAMPLE EXTENSION MAIN: DEACTIVATED'); } }