From 98d13180ea614d512834728786ce0124fae966f1 Mon Sep 17 00:00:00 2001 From: Tanner Lewis Date: Thu, 17 Oct 2024 16:02:03 -0400 Subject: [PATCH] Switch integ test level to INFO and minor top level cleanup (#1078) Signed-off-by: Tanner Lewis --- Jenkinsfile | 78 ------------------- .../lib/integ_test/integ_test/conftest.py | 7 +- .../jenkinsdocker}/Dockerfile | 0 .../jenkinsdocker}/buildAll.xml | 0 .../jenkinsdocker}/buildFromLocal.xml | 0 .../jenkinsdocker}/config.yml | 0 .../jenkinsdocker}/configuration.yaml | 0 .../jenkinsdocker}/copyGitTrackedFiles.sh | 0 .../jenkinsdocker}/docker-compose.yml | 0 .../jenkinsdocker}/plugins.txt | 0 10 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 Jenkinsfile rename {jenkinsdocker => dev-tools/jenkinsdocker}/Dockerfile (100%) rename {jenkinsdocker => dev-tools/jenkinsdocker}/buildAll.xml (100%) rename {jenkinsdocker => dev-tools/jenkinsdocker}/buildFromLocal.xml (100%) rename {jenkinsdocker => dev-tools/jenkinsdocker}/config.yml (100%) rename {jenkinsdocker => dev-tools/jenkinsdocker}/configuration.yaml (100%) rename {jenkinsdocker => dev-tools/jenkinsdocker}/copyGitTrackedFiles.sh (100%) rename {jenkinsdocker => dev-tools/jenkinsdocker}/docker-compose.yml (100%) rename {jenkinsdocker => dev-tools/jenkinsdocker}/plugins.txt (100%) diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 7b1344bce..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,78 +0,0 @@ -pipeline { - environment { - // GIT_URL = 'https://github.com/mikaylathompson/opensearch-migrations.git' - GIT_URL = 'https://github.com/opensearch-project/opensearch-migrations.git' - GIT_BRANCH = 'main' - STAGE = 'aws-integ' - } - - agent any - - parameters { - booleanParam(name: 'USE_LOCAL_WORKSPACE', defaultValue: false, description: 'Use local workspace for the build') - string(name: 'BRANCH_NAME', defaultValue: 'main', description: 'Branch to build from') - } - - stages { - stage('Checkout') { - agent any - steps { - script { - if (params.USE_LOCAL_WORKSPACE) { - sh "/copyGitTrackedFiles.sh /opensearch-migrations-src ." - } else { - git branch: "${params.BRANCH_NAME}", url: "${env.GIT_URL}" - } - } - } - } - - stage('Test Caller Identity') { - agent any - steps { - sh 'aws sts get-caller-identity' - } - } - - stage('Build') { - agent any - steps { - timeout(time: 1, unit: 'HOURS') { - dir('TrafficCapture') { - sh './gradlew build -x test' - } - } - } - } - - stage('Deploy') { - steps { - dir('test') { - sh 'sudo usermod -aG docker $USER' - sh 'sudo newgrp docker' - sh "sudo ./awsE2ESolutionSetup.sh --stage ${env.STAGE} --migrations-git-url ${env.GIT_URL} --migrations-git-branch ${env.GIT_BRANCH}" - } - } - } - - stage('Integ Tests') { - steps { - dir('test') { - script { - def time = new Date().getTime() - def uniqueId = "integ_min_${time}_${currentBuild.number}" - sh "sudo ./awsRunIntegTests.sh --stage ${env.STAGE} --migrations-git-url ${env.GIT_URL} --migrations-git-branch ${env.GIT_BRANCH} --unique-id ${uniqueId}" - } - } - - } - } - } -// post { -// always { -// dir('test') { -// sh "sudo ./awsE2ESolutionSetup.sh --stage ${env.STAGE} --run-post-actions" -// } -// } -// } -} \ No newline at end of file diff --git a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/integ_test/integ_test/conftest.py b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/integ_test/integ_test/conftest.py index 3efb7fbe2..5c899f995 100644 --- a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/integ_test/integ_test/conftest.py +++ b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/integ_test/integ_test/conftest.py @@ -5,14 +5,11 @@ def pytest_configure(config): - # Configure logging - logging.basicConfig(level=logging.DEBUG, + # Configure logging, avoid sensitive data at lower logs levels + logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s', datefmt='%Y-%m-%d %H:%M:%S') - # This line ensures that log messages are displayed on the console during test runs - logging.getLogger().setLevel(logging.DEBUG) - def pytest_addoption(parser): parser.addoption("--unique_id", action="store", default=uuid.uuid4().hex) diff --git a/jenkinsdocker/Dockerfile b/dev-tools/jenkinsdocker/Dockerfile similarity index 100% rename from jenkinsdocker/Dockerfile rename to dev-tools/jenkinsdocker/Dockerfile diff --git a/jenkinsdocker/buildAll.xml b/dev-tools/jenkinsdocker/buildAll.xml similarity index 100% rename from jenkinsdocker/buildAll.xml rename to dev-tools/jenkinsdocker/buildAll.xml diff --git a/jenkinsdocker/buildFromLocal.xml b/dev-tools/jenkinsdocker/buildFromLocal.xml similarity index 100% rename from jenkinsdocker/buildFromLocal.xml rename to dev-tools/jenkinsdocker/buildFromLocal.xml diff --git a/jenkinsdocker/config.yml b/dev-tools/jenkinsdocker/config.yml similarity index 100% rename from jenkinsdocker/config.yml rename to dev-tools/jenkinsdocker/config.yml diff --git a/jenkinsdocker/configuration.yaml b/dev-tools/jenkinsdocker/configuration.yaml similarity index 100% rename from jenkinsdocker/configuration.yaml rename to dev-tools/jenkinsdocker/configuration.yaml diff --git a/jenkinsdocker/copyGitTrackedFiles.sh b/dev-tools/jenkinsdocker/copyGitTrackedFiles.sh similarity index 100% rename from jenkinsdocker/copyGitTrackedFiles.sh rename to dev-tools/jenkinsdocker/copyGitTrackedFiles.sh diff --git a/jenkinsdocker/docker-compose.yml b/dev-tools/jenkinsdocker/docker-compose.yml similarity index 100% rename from jenkinsdocker/docker-compose.yml rename to dev-tools/jenkinsdocker/docker-compose.yml diff --git a/jenkinsdocker/plugins.txt b/dev-tools/jenkinsdocker/plugins.txt similarity index 100% rename from jenkinsdocker/plugins.txt rename to dev-tools/jenkinsdocker/plugins.txt