From e7e7eb99d80ddfc25e30a20369bde7242d0a6dae Mon Sep 17 00:00:00 2001 From: prplV Date: Mon, 13 Jan 2025 15:09:53 +0300 Subject: [PATCH 1/8] init commit --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c11e198..683b17f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any stages { - stage('Tests and compiling binaries1') { + stage('Tests and compiling binaries') { when { expression { env.CHANGE_BRANCH?.startsWith('feature/') } } -- 2.40.1 From a25a630d77c880d97ee3415f547a396b148fb0ed Mon Sep 17 00:00:00 2001 From: prplV Date: Mon, 13 Jan 2025 15:17:32 +0300 Subject: [PATCH 2/8] test fix not to test bash code ) --- noxis-rs/src/options/preboot.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxis-rs/src/options/preboot.rs b/noxis-rs/src/options/preboot.rs index 8130e96..84a3f27 100644 --- a/noxis-rs/src/options/preboot.rs +++ b/noxis-rs/src/options/preboot.rs @@ -10,7 +10,7 @@ const SOCKET_PATH: &str = "/var/run/enode/hostagent.sock"; /// ## for setting up metrics mode as preboot param from command prompt /// /// examples: -/// ``` +/// ``` bash /// noxis-rs ... --metrics full /// noxis-rs ... --metrics system /// noxis-rs ... --metrics processes -- 2.40.1 From 576a5e0739a08c7b2ce7f0297517b556070c5c47 Mon Sep 17 00:00:00 2001 From: prplV Date: Mon, 13 Jan 2025 15:25:10 +0300 Subject: [PATCH 3/8] cicd fix with dep installing --- Dockerfile | 3 +++ Jenkinsfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee3f295..350c576 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,9 @@ RUN apt update && apt install -y \ pkg-config \ libudev-dev \ procps \ + gcc-riscv64-unknown-elf \ + gcc-riscv64-linux-gnu \ + binutils-riscv64-linux-gnu \ && rm -rf /var/lib/apt/lists/* RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/Jenkinsfile b/Jenkinsfile index 683b17f..b282227 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { sh "mkdir -p ${targetDir}" sh """ - docker build --network=host -t e-monitor . + docker build --network=host -t --no-cache e-monitor . docker run --name e-monitor --dns 8.8.8.8 --network=host e-monitor:latest """ -- 2.40.1 From d229ae1ce94a26a45d1bf90f56e5a839e85b8643 Mon Sep 17 00:00:00 2001 From: prplV Date: Mon, 13 Jan 2025 15:31:51 +0300 Subject: [PATCH 4/8] cicd fix#2 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b282227..55163e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { sh "mkdir -p ${targetDir}" sh """ - docker build --network=host -t --no-cache e-monitor . + docker build --network=host --no-cache -t e-monitor . docker run --name e-monitor --dns 8.8.8.8 --network=host e-monitor:latest """ -- 2.40.1 From 0e959b9a58ce055456fe41436c1f92c221d7f4b0 Mon Sep 17 00:00:00 2001 From: yuobrezkov Date: Mon, 13 Jan 2025 15:47:44 +0300 Subject: [PATCH 5/8] Changed Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 55163e3..22330c7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,7 +69,7 @@ pipeline { } steps { script { - echo "Attempting to merge PR ${env.CHANGE_ID} using credentials..." + echo "Attempting to merge PR ${env.CHANGE_ID} using credentials ..." withCredentials([usernamePassword(credentialsId: 'Jenkins creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) { def prId = env.CHANGE_ID sh """ -- 2.40.1 From 497dcbaeb6d0ef21e96fcb8519eb83d00effe952 Mon Sep 17 00:00:00 2001 From: yuobrezkov Date: Mon, 13 Jan 2025 16:25:04 +0300 Subject: [PATCH 6/8] Added / for target folders --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 22330c7..505eea2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,8 +9,8 @@ pipeline { script { echo "Building and running tests in Docker for feature branch..." try { - def targetDirAmd = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/x86" - def targetDirRisc = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/riscv" + def targetDirAmd = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/x86/" + def targetDirRisc = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/riscv/" sh "mkdir -p ${targetDir}" -- 2.40.1 From f6c952f20880264afcae1ff6716992d5d2d6beed Mon Sep 17 00:00:00 2001 From: yuobrezkov Date: Mon, 13 Jan 2025 16:30:06 +0300 Subject: [PATCH 7/8] changed creating folders for binaries --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 505eea2..4f40ac6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,11 +12,11 @@ pipeline { def targetDirAmd = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/x86/" def targetDirRisc = "${env.WORKSPACE}/${env.CHANGE_BRANCH}/riscv/" - sh "mkdir -p ${targetDir}" + sh "mkdir -p ${targetDirAmd}" + sh "mkdir -p ${targetDirRisc}" sh """ docker build --network=host --no-cache -t e-monitor . - docker run --name e-monitor --dns 8.8.8.8 --network=host e-monitor:latest """ -- 2.40.1 From 390f496004d61c37cccba454348581484fae6b27 Mon Sep 17 00:00:00 2001 From: yuobrezkov Date: Mon, 13 Jan 2025 16:56:48 +0300 Subject: [PATCH 8/8] Modified Dockerfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4f40ac6..8ec20b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { sh "mkdir -p ${targetDirRisc}" sh """ - docker build --network=host --no-cache -t e-monitor . + docker build --network=host -t e-monitor . docker run --name e-monitor --dns 8.8.8.8 --network=host e-monitor:latest """ -- 2.40.1