Skip to content

Commit

Permalink
By popular demand: Renamed 'run-ci' scripts to simply 'run'.
Browse files Browse the repository at this point in the history
Change-Id: I72afab8a67493675ddd7dbacb61e3a4f598d8f4b
  • Loading branch information
spt29 committed Feb 7, 2023
1 parent 361186c commit 34af950
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion agents/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ setversion:
build: $(DEB_PACKAGE) $(RPM_PACKAGE) $(WIN_PACKAGE) $(AGENT_CTL)

$(AGENT_CTL):
$(AGENT_CTL_DIR)/run-ci --setup-environment --build
$(AGENT_CTL_DIR)/run --setup-environment --build
mkdir -p linux
install -m 755 $(AGENT_CTL_DIR)/target/x86_64-unknown-linux-musl/release/cmk-agent-ctl $(AGENT_CTL)
strip $(AGENT_CTL)
Expand Down
4 changes: 2 additions & 2 deletions buildscripts/scripts/stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ STAGES:
- NAME: 'Test - Livestatus'
ONLY_WHEN_NOT_EMPTY: CHANGED_LIVESTATUS_FILES,CHANGED_ASIO_FILES,CHANGED_GOOGLETEST_FILES,CHANGED_RE2_FILES
DIR: 'packages/livestatus'
COMMAND: "../../scripts/run-in-docker.sh ./run-ci --all &> ${RESULTS}/livestatus.txt"
COMMAND: "../../scripts/run-in-docker.sh ./run --all &> ${RESULTS}/livestatus.txt"
TEXT_ON_SKIP: 'No Livestatus files changed'
RESULT_CHECK_TYPE: "GCC"
RESULT_CHECK_FILE_PATTERN: "results/livestatus.txt"
Expand Down Expand Up @@ -343,6 +343,6 @@ STAGES:
- NAME: 'Test - Agent Controller'
ONLY_WHEN_NOT_EMPTY: CHANGED_AGENT_CONTROLLER_FILES
DIR: 'packages/cmk-agent-ctl'
COMMAND: "../../scripts/run-in-docker.sh ./run-ci --setup-environment --all &> ${RESULTS}/agent-controller.txt"
COMMAND: "../../scripts/run-in-docker.sh ./run --setup-environment --all &> ${RESULTS}/agent-controller.txt"
TEXT_ON_SKIP: 'No agent controller files changed'
RESULT_CHECK_FILE_PATTERN: "results/agent-controller.txt"
2 changes: 1 addition & 1 deletion buildscripts/scripts/test-agent-controller.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def main() {
dir("${checkout_dir}") {
docker_image_from_alias("IMAGE_TESTING").inside() {
stage('Compile & Test Agent Controller') {
sh("packages/cmk-agent-ctl/run-ci --setup-environment --clean --all");
sh("packages/cmk-agent-ctl/run --setup-environment --clean --all");
}
}
stage("Analyse Issues") {
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/scripts/test-livestatus.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def main() {
dir("${checkout_dir}") {
docker_image_from_alias("IMAGE_TESTING").inside() {
stage('Compile & Test Livestatus') {
sh("packages/livestatus/run-ci --clean --all");
sh("packages/livestatus/run --clean --all");
}
}
stage("Analyse Issues") {
Expand Down
4 changes: 2 additions & 2 deletions livestatus/src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ASIO_VERSION := asio-1.24.0-patched
ASIO_INCLUDE := $(INCLUDES_DIR)/asio

LIBLIVESTATUS_PATH := $(abs_top_srcdir)/packages/livestatus
LIBLIVESTATUS_RUN_CI := $(LIBLIVESTATUS_PATH)/run-ci
LIBLIVESTATUS_RUN := $(LIBLIVESTATUS_PATH)/run
LIBLIVESTATUS_INCLUDE := $(LIBLIVESTATUS_PATH)/include
LIBLIVESTATUS_SO := $(LIBLIVESTATUS_PATH)/build/src/liblivestatus.so
RE2_INCLUDE := $(LIBLIVESTATUS_PATH)/build/_deps/re2-src
Expand Down Expand Up @@ -79,7 +79,7 @@ test_neb_LDADD = \
.PHONY: always-rebuild-livestatus-lib
$(LIBLIVESTATUS_SO): always-rebuild-livestatus-lib
@echo Building lib livestatus...
$(LIBLIVESTATUS_RUN_CI) --build
$(LIBLIVESTATUS_RUN) --build

unit-test: test_neb$(EXEEXT) $(LIBLIVESTATUS_SO)
LD_LIBRARY_PATH=$(dir $(LIBLIVESTATUS_SO)) \
Expand Down
2 changes: 1 addition & 1 deletion omd/packages/livestatus/livestatus.make
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LIVESTATUS_BUILD := $(BUILD_HELPER_DIR)/livestatus-build
LIVESTATUS_INSTALL := $(BUILD_HELPER_DIR)/livestatus-install

$(LIVESTATUS_BUILD):
$(LIVESTATUS_PACKAGE)/run-ci --build
$(LIVESTATUS_PACKAGE)/run --build
$(TOUCH) $@

$(LIVESTATUS_INSTALL): $(LIVESTATUS_BUILD)
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 34af950

Please sign in to comment.