build: tests

metwork-framework · Jan 27, 2025 · 400da40 · 400da40
1 parent 6cf43b7
commit 400da40
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -1 +1,2 @@
+ES_JAVA_HOME={MFEXT_HOME}/opt/java
 MFADMIN_LAYER_LOGS_LOADED=1
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		ES_JAVA_HOME={MFEXT_HOME}/opt/java
		MFADMIN_LAYER_LOGS_LOADED=1