From 879d37b2de6eb7ea24232cdb65cd1adf2753d281 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 6 Sep 2022 10:21:55 +0200 Subject: [PATCH] Enable testing for all files to force ran-base rebuild --- ci-scripts/cls_cluster.py | 4 +--- ci-scripts/cls_oai_html.py | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index debe4c238b..519769d0a7 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -259,9 +259,7 @@ class Cluster: if self.ranAllowMerge: # merging MR branch into develop -> temporary image imageTag = 'ci-temp' if self.ranTargetBranch == 'develop': - # TODO IMPORTANT: delete next line, uncomment following - mySSH.command(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper | grep --colour=never -i INDEX', '\$', 5) - #mySSH.command(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX', '\$', 5) + mySSH.command(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX', '\$', 5) result = re.search('index', mySSH.getBefore()) if result is not None: forceBaseImageBuild = True diff --git a/ci-scripts/cls_oai_html.py b/ci-scripts/cls_oai_html.py index 13a1ab8691..536f2ff49e 100644 --- a/ci-scripts/cls_oai_html.py +++ b/ci-scripts/cls_oai_html.py @@ -453,13 +453,11 @@ class HTMLManagement(): self.htmlFile.write(' ' + str(parameters['warnings']) + '\n') elif (parameters['warnings'] == 0): self.htmlFile.write(' ' + str(parameters['warnings']) + '\n') - elif ((parameters['warnings'] > 0) and (parameters['warnings'] <= 20)): - self.htmlFile.write(' ' + str(parameters['warnings']) + '\n') else: - self.htmlFile.write(' ' + str(parameters['warnings']) + '\n') + self.htmlFile.write(' ' + str(parameters['warnings']) + '\n') if (parameters['errors'] == 0) and (parameters['warnings'] == 0): self.htmlFile.write(' OK \n') - elif (parameters['errors'] == 0) and ((parameters['warnings'] > 0) and (parameters['warnings'] <= 20)): + elif (parameters['errors'] == 0): self.htmlFile.write(' OK \n') else: self.htmlFile.write(' NOT OK \n')