From 400da4083d46c477c9faa02b69dc94e6cb2d89d9 Mon Sep 17 00:00:00 2001
From: thebaptiste <jean-baptiste.veslin@meteo.fr>
Date: Mon, 27 Jan 2025 18:45:40 +0000
Subject: [PATCH] build: tests

---
 .github/workflows/ci.yml                | 18 +++++++++---------
 adm/before_start_elasticsearch          |  1 -
 layers/layer1_logs/.layerapi2_extra_env |  1 +
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12b96bc..09d2019 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,15 +85,6 @@ jobs:
             mkdir -p ${REMOTE}
           scp: |
             '${LOCAL}/*' => ${REMOTE}
-      - name: integration tests
-        if: ${{ steps.SetVariables.outputs.branch != 'null' && steps.BuildStep.outputs.bypass == 'false' }}
-        run: |
-          TESTIMAGE=${{ steps.SetVariables.outputs.testimage }}
-          DEP_BRANCH=${{ steps.SetVariables.outputs.dep_branch }}
-          BRANCH=${{ steps.SetVariables.outputs.branch }}
-          OS_VERSION=${{ steps.SetVariables.outputs.os }}
-          docker pull ${TESTIMAGE}
-          docker run ${DOCKER_RUN_OPTIONS} -e DEP_BRANCH=${DEP_BRANCH} -e BRANCH=${BRANCH} -e OS_VERSION=${OS_VERSION} --rm ${TESTIMAGE} /bin/bash -c "${DOCKER_WORKFLOW_SCRIPTS_DIR}/integration_tests.sh"
       - name: publish rpms
         if: ${{ github.event_name != 'pull_request' && steps.BuildStep.outputs.bypass == 'false' && steps.SetVariables.outputs.branch != 'null' }}
         uses: thebaptiste/ssh-scp-ssh-pipelines@metwork
@@ -126,6 +117,15 @@ jobs:
             cd ${REMOTE}
             chmod +x createrepo.sh
             ./createrepo.sh .
+      - name: integration tests
+        if: ${{ steps.SetVariables.outputs.branch != 'null' && steps.BuildStep.outputs.bypass == 'false' }}
+        run: |
+          TESTIMAGE=${{ steps.SetVariables.outputs.testimage }}
+          DEP_BRANCH=${{ steps.SetVariables.outputs.dep_branch }}
+          BRANCH=${{ steps.SetVariables.outputs.branch }}
+          OS_VERSION=${{ steps.SetVariables.outputs.os }}
+          docker pull ${TESTIMAGE}
+          docker run ${DOCKER_RUN_OPTIONS} -e DEP_BRANCH=${DEP_BRANCH} -e BRANCH=${BRANCH} -e OS_VERSION=${OS_VERSION} --rm ${TESTIMAGE} /bin/bash -c "${DOCKER_WORKFLOW_SCRIPTS_DIR}/integration_tests.sh"
       - name: publish doc
         if: ${{ github.event_name != 'pull_request' && steps.BuildStep.outputs.bypass == 'false' && steps.SetVariables.outputs.branch != 'null' }}
         uses: thebaptiste/ssh-scp-ssh-pipelines@metwork
diff --git a/adm/before_start_elasticsearch b/adm/before_start_elasticsearch
index bc918b7..fabb3bd 100755
--- a/adm/before_start_elasticsearch
+++ b/adm/before_start_elasticsearch
@@ -4,7 +4,6 @@ mkdir -p "${MFMODULE_RUNTIME_HOME}/var/elasticsearch"
 rm -Rf "${MFMODULE_RUNTIME_HOME}/tmp/elasticsearch"
 mkdir -p "${MFMODULE_RUNTIME_HOME}/tmp/elasticsearch"
 cp -Rf "${MFMODULE_HOME}/opt/logs/opt/elasticsearch/config" "${MFMODULE_RUNTIME_HOME}/tmp/elasticsearch"
-cp -Rf "${MFMODULE_HOME}/opt/logs/opt/elasticsearch/jdk" "${MFMODULE_RUNTIME_HOME}/tmp/elasticsearch"
 for DIR in bin lib modules; do
     ln -s "${MFMODULE_HOME}/opt/logs/opt/elasticsearch/${DIR}" "${MFMODULE_RUNTIME_HOME}/tmp/elasticsearch/${DIR}"
 done
diff --git a/layers/layer1_logs/.layerapi2_extra_env b/layers/layer1_logs/.layerapi2_extra_env
index a75d761..9655712 100644
--- a/layers/layer1_logs/.layerapi2_extra_env
+++ b/layers/layer1_logs/.layerapi2_extra_env
@@ -1 +1,2 @@
+ES_JAVA_HOME={MFEXT_HOME}/opt/java
 MFADMIN_LAYER_LOGS_LOADED=1