diff --git a/bundle-workflow/.flake8 b/.flake8 similarity index 100% rename from bundle-workflow/.flake8 rename to .flake8 diff --git a/.github/workflows/bundle-workflow.yml b/.github/workflows/bundle-workflow.yml index 641fed6fb2..e5715c1643 100644 --- a/.github/workflows/bundle-workflow.yml +++ b/.github/workflows/bundle-workflow.yml @@ -3,10 +3,12 @@ name: bundle-workflow on: push: paths: - - bundle-workflow/** + - src/** + - tests/** pull_request: paths: - - bundle-workflow/** + - src/** + - tests/** jobs: test: @@ -18,9 +20,6 @@ jobs: runs-on: ${{ matrix.os }} env: PYTHON_VERSION: 3.7 - defaults: - run: - working-directory: ./bundle-workflow steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} @@ -46,4 +45,4 @@ jobs: - name: Upload Coverage Report uses: codecov/codecov-action@v2 with: - files: ./bundle-workflow/coverage.xml + files: ./coverage.xml diff --git a/.github/workflows/manifests.yml b/.github/workflows/manifests.yml index b2e56b01f6..b54366ee52 100644 --- a/.github/workflows/manifests.yml +++ b/.github/workflows/manifests.yml @@ -43,4 +43,4 @@ jobs: python -m pip install --upgrade pipenv wheel - name: OpenSearch Manifests run: | - ./bundle-workflow/ci.sh ${{ matrix.manifest }} --snapshot + ./ci.sh ${{ matrix.manifest }} --snapshot diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml index f5c0a438ec..4421ba4a71 100644 --- a/.github/workflows/versions.yml +++ b/.github/workflows/versions.yml @@ -30,7 +30,7 @@ jobs: key: ${{ runner.os }}-build-cache-maven-local - name: Update OpenSearch Manifests run: | - ./bundle-workflow/manifests.sh update + ./manifests.sh update - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: diff --git a/.gitignore b/.gitignore index 8a4da09ef2..0fe1c56e19 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,3 @@ out.txt /artifacts/ /bundle/ -/bundle-workflow/artifacts/ -/bundle-workflow/bundle/ diff --git a/bundle-workflow/.pre-commit-config.yaml b/.pre-commit-config.yaml similarity index 52% rename from bundle-workflow/.pre-commit-config.yaml rename to .pre-commit-config.yaml index dd2f1c3d12..361a4bbb23 100644 --- a/bundle-workflow/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,25 +7,21 @@ repos: - id: isort stages: [commit] name: isort - entry: bash -c 'cd bundle-workflow && pipenv run isort --check .' + entry: bash -c 'pipenv run isort --check .' language: system types: [python] - files: ^bundle-workflow/ - id: flake8 stages: [commit] name: flake8 - entry: bash -c 'cd bundle-workflow && pipenv run flake8 .' + entry: bash -c 'pipenv run flake8 .' language: system - files: ^bundle-workflow/ - id: mypy stages: [commit] name: mypy - entry: bash -c 'cd bundle-workflow && pipenv run mypy .' + entry: bash -c 'pipenv run mypy .' language: system - files: ^bundle-workflow/ - id: pytest stages: [commit] name: pytest - entry: bash -c 'cd bundle-workflow && pipenv run pytest' + entry: bash -c 'pipenv run pytest' language: system - files: ^bundle-workflow/ diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index 68712ce136..1633cc3be2 100644 --- a/DEVELOPER_GUIDE.md +++ b/DEVELOPER_GUIDE.md @@ -70,8 +70,7 @@ npm install -g yarn Install dependencies. ``` -cd bundle-workflow -~/.../bundle-workflow $ pipenv install +$ pipenv install Installing dependencies from Pipfile.lock (1f4869)... 🐍 ▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉▉ 0/0 — 00:00:00 To activate this project's virtualenv, run pipenv shell. @@ -80,16 +79,16 @@ Alternatively, run a command inside the virtualenv with pipenv run. ### Run Tests -This project uses [pytest](https://docs.pytest.org/en/6.x/) to ensure code quality. See [bundle-workflow/tests](bundle-workflow). +This project uses [pytest](https://docs.pytest.org/en/6.x/) to ensure code quality. See [tests](tests). ``` -~/.../bundle-workflow $ pipenv run pytest +$ pipenv run pytest 2 passed in 02s ``` ### Run bundle-workflow -Try running `./build.sh` from [bundle-workflow](./bundle-workflow). It should complete and show usage. +Try running `./build.sh`. It should complete and show usage. ``` $ ./build.sh @@ -124,7 +123,7 @@ Use `isort .` to fix any sorting order. ``` $ pipenv run isort . -Fixing bundle-workflow/tests/system/test_arch.py +Fixing tests/system/test_arch.py ``` Use [black](https://black.readthedocs.io/en/stable/) to auto-format your code. @@ -143,7 +142,7 @@ This project uses [mypy](https://github.com/python/mypy) as an optional static t ``` pipenv run mypy . -bundle-workflow/src/assemble.py:14: error: Cannot find implementation or library stub for module named "assemble_workflow.bundle" +src/assemble.py:14: error: Cannot find implementation or library stub for module named "assemble_workflow.bundle" ``` ### Code Coverage @@ -160,12 +159,6 @@ TOTAL 23491 12295 48% ### Pre-Commit Cheatsheet -Run from `bundle-workflow` before making pull requests. - -``` -cd bundle-workflow -``` - The pre-commit hook checks for imports, type, style and test. ``` diff --git a/bundle-workflow/Jenkinsfile b/Jenkinsfile similarity index 97% rename from bundle-workflow/Jenkinsfile rename to Jenkinsfile index 77251a2de6..98b241f92a 100644 --- a/bundle-workflow/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ pipeline { steps { script { git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' - sh "./bundle-workflow/build.sh manifests/$INPUT_MANIFEST --snapshot" + sh "./build.sh manifests/$INPUT_MANIFEST --snapshot" withCredentials([usernamePassword(credentialsId: 'Sonatype', usernameVariable: 'SONATYPE_USERNAME', passwordVariable: 'SONATYPE_PASSWORD')]) { sh('$WORKSPACE/publish/publish-snapshot.sh $WORKSPACE/artifacts/$ARTIFACT_PATH/maven') } @@ -120,8 +120,8 @@ pipeline { void build() { git url: 'https://github.com/opensearch-project/opensearch-build.git', branch: 'main' - sh "./bundle-workflow/build.sh manifests/$INPUT_MANIFEST" - sh './bundle-workflow/assemble.sh artifacts/manifest.yml' + sh "./build.sh manifests/$INPUT_MANIFEST" + sh './assemble.sh artifacts/manifest.yml' script { manifest = readYaml(file: 'artifacts/manifest.yml') } def artifactPath = "${manifest.build.version}/${OPENSEARCH_BUILD_ID}/${manifest.build.architecture}"; diff --git a/ONBOARDING.md b/ONBOARDING.md index dcaaf821b5..2bb5555e98 100644 --- a/ONBOARDING.md +++ b/ONBOARDING.md @@ -10,18 +10,18 @@ This document describes steps to onboard a new plugin to release workflow for co 3. Ensure your `build.sh` reads and passes along both `-Dbuild.snapshot=` and `-Dopensearch.version=` flags. Snapshot builds should produce a -SNAPSHOT tagged artifact for example `opensearch-plugin-1.1.0.0-SNAPSHOT.zip` where a release build of the same component would produce `opensearch-plugin-1.1.0.0.zip`. -4. Execute `./bundle-workflow/build.sh` to ensure your component builds and all artifacts are correctly placed into ./artifacts/ with correct output names. +4. Execute `./build.sh` to ensure your component builds and all artifacts are correctly placed into ./artifacts/ with correct output names. -5. Execute `./bundle-workflow/assemble.sh` to ensure the full bundle is assembled and placed in to /bundles/*.tar.gz. Unpack the tarball to ensure all your components are placed in their correct locations. +5. Execute `./assemble.sh` to ensure the full bundle is assembled and placed in to /bundles/*.tar.gz. Unpack the tarball to ensure all your components are placed in their correct locations. 6. Publish a PR to this repo including the updated manifest and the names of the artifacts being added. ### Step 2: Onboard to `test-workflow` -1. Update the test configuration file, [test_manifest.yml](https://github.com/opensearch-project/opensearch-build/blob/main/bundle-workflow/src/test_workflow/config/test_manifest.yml), for a particular release, to include your plugin. This test configuration defines full suite of tests - `integ`, `bwc`, that can be run on the plugin. +1. Update the test configuration file, [test_manifest.yml](src/test_workflow/config/test_manifest.yml), for a particular release, to include your plugin. This test configuration defines full suite of tests - `integ`, `bwc`, that can be run on the plugin. -2. For integration testing, the `test-workflow` runs integration tests available in the plugin repository. You will need to add `integ-test` config for your plugin in test_manifest.yml, [example](https://github.com/opensearch-project/opensearch-build/blob/85bbe204e947d5d1579af771bbafe399c11cbd70/bundle-workflow/src/test_workflow/config/test_manifest.yml#L3). +2. For integration testing, the `test-workflow` runs integration tests available in the plugin repository. You will need to add `integ-test` config for your plugin in test_manifest.yml, [example](src/test_workflow/config/test_manifest.yml#L3). 1. It supports two test configs - `with-security` and `without-security`, which runs test with security plugin enabled and disabled respectively. Choose one or both depending on what your plugin integration tests support. 2. If your plugin is dependent on `job-scheduler` zip, you can define that in `build-dependencies` in the config. Currently, the test workflow only supports `job-scheduler` as build dependency. Please create an issue if your plugin needs more support. -3. For backward compatibility testing, the `test-workflow` runs backward compatibility tests available in the plugin repository, (see [reference]((https://github.com/opensearch-project/anomaly-detection/blob/d9a122d05282f7efc1e24c61d64f18dec0fd47af/build.gradle#L428))). Like integration test, it has a set of configurable options defined in test_manifest.yml, [example](https://github.com/opensearch-project/opensearch-build/blob/85bbe204e947d5d1579af771bbafe399c11cbd70/bundle-workflow/src/test_workflow/config/test_manifest.yml#L8). +3. For backward compatibility testing, the `test-workflow` runs backward compatibility tests available in the plugin repository, (see [reference]((https://github.com/opensearch-project/anomaly-detection/blob/d9a122d05282f7efc1e24c61d64f18dec0fd47af/build.gradle#L428))). Like integration test, it has a set of configurable options defined in test_manifest.yml, [example](src/test_workflow/config/test_manifest.yml#L8). diff --git a/bundle-workflow/Pipfile b/Pipfile similarity index 100% rename from bundle-workflow/Pipfile rename to Pipfile diff --git a/bundle-workflow/Pipfile.lock b/Pipfile.lock similarity index 100% rename from bundle-workflow/Pipfile.lock rename to Pipfile.lock diff --git a/README.md b/README.md index 3143a25613..9380057c8c 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,23 @@ - [Creating a New Version](#creating-a-new-version) - [Onboarding a New Plugin](#onboarding-a-new-plugin) - [Building and Testing an OpenSearch Distribution](#building-and-testing-an-opensearch-distribution) + - [How it works](#how-it-works) + - [OpenSearch](#opensearch) + - [OpenSearch Dashboards](#opensearch-dashboards) + - [CI CD Environment](#ci-cd-environment) + - [Build CI Runner Docker Image from Dockerfile](#build-ci-runner-docker-image-from-dockerfile) + - [Check Out Source](#check-out-source) + - [Build from Source](#build-from-source) + - [Custom Build Scripts](#custom-build-scripts) + - [Assemble the Bundle](#assemble-the-bundle) + - [Custom Install Scripts](#custom-install-scripts) + - [Sign Artifacts](#sign-artifacts) + - [Test the Bundle](#test-the-bundle) + - [Integration Tests](#integration-tests) + - [Backwards Compatibility Tests](#backwards-compatibility-tests) + - [Performance Tests](#performance-tests) + - [Sanity Check the Bundle](#sanity-check-the-bundle) + - [Auto-Generate Manifests](#auto-generate-manifests) - [Making a Release](#making-a-release) - [Releasing for Linux](#releasing-for-linux) - [Releasing for FreeBSD](#releasing-for-freebsd) @@ -27,11 +44,296 @@ OpenSearch and OpenSearch Dashboards are distributed as bundles that include bot ### Onboarding a New Plugin -Plugin owners can follow the [Onboarding document](ONBOARDING.md) to onboard their plugins to the release process. +Plugin owners can follow the [Onboarding Process](ONBOARDING.md) to onboard their plugins to the release process. ### Building and Testing an OpenSearch Distribution -OpenSearch and its components are built from source, assembled, signed and tested using the [bundle workflow](bundle-workflow/README.md). +The bundle workflow builds a complete OpenSearch and OpenSearch Dashboards distribution from source. You can currently build 1.0, 1.1 and 1.1-SNAPSHOT versions. + +#### How it works + +This system performs a top-down build of all components required for a specific OpenSearch and OpenSearch Dashboards bundle release. The input to the system is a manifest that defines the order in which components should be built. +All manifests for our current releases are [here](manifests). + +To build components we rely on a common entry-point in the form of a `build.sh` script. See [Custom Build Scripts](#custom-build-scripts). + +Within each build script components have the option to place artifacts in a set of directories to be picked up and published on their behalf. These are as follows. + +| name | description | +|--------------------|----------------------------------------------------------------------------------------------------| +| /maven | Include any publications that should be pushed to maven | +| /plugins | Where a plugin zip should be placed. If included it will be installed during bundle assembly. | +| /core-plugins | Where plugins shipped from `https://github.com/opensearch-project/OpenSearch` should be placed | +| /bundle | Where the min bundle should be placed when built from `https://github.com/opensearch-project/OpenSearch`| +| /libs | Where any additional libs should be placed that are required during bundle assembly | + +##### OpenSearch + +The build order first publishes `OpenSearch` followed by `common-utils`, and publishes these artifacts to maven local so that they are available for each component. In order to ensure that the same versions are used, a `-Dopensearch.version` flag is provided to each component's build script that defines which version the component should build against. + +##### OpenSearch Dashboards + +The build order first pulls down `OpenSearch-Dashboards` and then utilizes it to build other components. Currently, building plugins requires having the core repository built firstt to bootstrap and build the modules utilized by plugins. + +#### CI CD Environment + +We build, assemble, and test our artifacts on docker containers. All of our pipelines are using the same docker image for consistency. We provide docker files in [docker](docker) folder, and images on [staging docker hub repositories](https://hub.docker.com/r/opensearchstaging/ci-runner/). + +##### Build CI Runner Docker Image from Dockerfile + +* If you only want to build the docker image for either x64 or arm64, run this on a x64 or arm64 host respectively: + ``` + docker build -f ./docker/integtest-runner.al2.dockerfile . -t /: + ``` + +* If you want to build multi-arch docker image for both x64 and arm64, make sure you are using Docker Desktop: + * Run these commands to setup the multi-arch builder, you can re-use this build later on, just need to re-bootstrap again if you restart Docker Desktop: + ``` + docker buildx create --name multiarch + docker buildx use multiarch + docker buildx inspect --bootstrap + ``` + + * You should be able to see similar output in `docker ps` like this: + ``` + 123456789012 moby/buildkit:buildx-stable-1 "buildkitd" 11 minutes ago Up 11 minutes buildx_buildkit_multiarch0 + ``` + + * Docker buildx is using a container to build multi-arch images and combine all the layers together, so you can only upload it to Docker Hub, + or save it locally as cache, means `docker images` will not show the image due to your host cannot have more than one CPU architecture. + + * Run these commands to actually build the docker image in multi-arch and push to Docker Hub (est. 1hr time depend on your host hardware specifications and network bandwidth): + ``` + docker buildx build --platform linux/amd64,linux/arm64 -t /: -f --push . + ``` + +#### Check Out Source + +The [checkout workflow](src/checkout_workflow) checks out source code for a given manifest for further examination. + +```bash +./checkout.sh manfiests/1.1.0/opensearch-1.1.0.yml +``` + +The following options are available. + +| name | description | +|--------------------|-------------------------------------------------------------------------| +| -v, --verbose | Show more verbose output. | + + +#### Build from Source + +Each build requires a manifest to be passed as input. We currently have the following input manifests. + +| name | description | +|-----------------------------------------------------------------------------|---------------------------------------------------------------| +| [opensearch-1.0.0.yml](/manifests/1.0.0/opensearch-1.0.0.yml) | Manifest to reproduce 1.0.0 build. | +| [opensearch-1.0.0-maven.yml](/manifests/1.0.0/opensearch-1.0.0-maven.yml) | One-time manifest to build maven artifacts for 1.0 from tags. | +| [opensearch-1.1.0.yml](/manifests/1.1.0/opensearch-1.1.0.yml) | Manifest for 1.1.0, the next version. | +| [opensearch-1.2.0.yml](/manifests/1.2.0/opensearch-1.2.0.yml) | Manifest for 1.2.0, the following version. | +| [opensearch-2.0.0.yml](/manifests/2.0.0/opensearch-2.0.0.yml) | Manifest for 2.0.0, the next major version of OpenSearch. | +| [opensearch-dashboards-1.1.0.yml](/manifests/1.1.0/opensearch-dashboards-1.1.0.yml) | Manifest for 1.1.0, the next version. + +The following example builds a snapshot version of OpenSearch 1.1.0. + +```bash +./build.sh manifests/1.1.0/opensearch-1.1.0.yml --snapshot +``` + +While the following builds a snapshot version of OpenSearch-Dashboards 1.1.0. + +```bash +./build.sh manifests/1.1.0/opensearch-dashboards-1.1.0.yml --snapshot +``` + +The [OpenSearch repo](https://github.com/opensearch-project/OpenSearch) is built first, followed by [common-utils](https://github.com/opensearch-project/common-utils), and all declared plugin repositories. These dependencies are published to maven local under `~/.m2`, and subsequent project builds pick those up. + +The [OpenSearch Dashboards repo](https://github.com/opensearch-project/OpenSearch-Dashboards) is built first, followed by all declared plugin repositories. + +All final output is placed into an `artifacts` folder along with a build output `manifest.yml` that contains output details. + +Artifacts will contain the following folders. + +``` +/artifacts + bundle/ <- contains opensearch or opensearch-dashboards min tarball + maven/ <- all built maven artifacts + plugins/ <- all built plugin zips + core-plugins/ <- all built core plugins zip + manifest.yml <- build manifest describing all built components and their artifacts +``` + +The following options are available in `build.sh`. + +| name | description | +|--------------------|-------------------------------------------------------------------------| +| --snapshot | Build a snapshot instead of a release artifact, default is `false`. | +| --component [name] | Rebuild a single component by name, e.g. `--component common-utils`. | +| --keep | Do not delete the temporary working directory on both success or error. | +| -v, --verbose | Show more verbose output. | + +##### Custom Build Scripts + +Each component build relies on a `build.sh` script that is used to prepare bundle artifacts for a particular bundle version that takes two arguments: version and target architecture. By default the tool will look for a script in [scripts/components](scripts/components), then in the checked-out repository in `build/build.sh`, then default to a Gradle build implemented in [scripts/default/build.sh](scripts/default/build.sh). + +#### Assemble the Bundle + +```bash +./assemble.sh artifacts/manifest.yml +``` + +The bundling step takes output from the build step, installs plugins, and assembles a full bundle into a `bundle` folder. The input requires a path to the build manifest and is expected to be inside the `artifacts` directory that contains `bundle`, `maven`, `plugins` and `core-plugins` subdirectories from the build step. + +Artifacts will be updated as follows. + +``` +/bundle + .tar.gz <- assembled tarball + manifest.yml <- bundle manifest describing versions for the min bundle and all installed plugins and their locations +``` + +##### Custom Install Scripts + +You can perform additional plugin install steps by adding an `install.sh` script. By default the tool will look for a script in [scripts/bundle-build/components](scripts/bundle-build/components), then default to a noop version implemented in [scripts/default/install.sh](scripts/default/install.sh). + +#### Sign Artifacts + +The signing step (optional) takes the manifest file created from the build step and signs all its component artifacts using a tool called `opensearch-signer-client` (in progress of being open-sourced). The input requires a path to the build manifest and is expected to be inside the artifacts directory with the same directories mentioned in the build step. + +The following options are available. + +| name | description | +|---------------|---------------------------------------------------------------------------------------| +| --component | The component name of the component whose artifacts will be signed. | +| --type | The artifact type to be signed. Currently one of 3 options: [plugins, maven, bundle]. | +| -v, --verbose | Show more verbose output. | + +The signed artifacts (.asc) will be found in the same location as the original artifact. + +The following command signs all artifacts. + +```bash +./bundle_workflow/sign.sh artifacts/manifest.yml +``` + +#### Test the Bundle + +Tests the OpenSearch bundle. + +This workflow contains integration, backwards compatibility and performance tests. + +More details around how this workflow is instrumented as part of CI CD, are covered [here](src/test_workflow/README.md). + +Usage: +```bash +export AWS_ROLE_ARN=arn:aws:iam:::role/opensearch-test +export AWS_ROLE_SESSION_NAME=dummy-session + +export AWS_SESSION_TOKEN= +export AWS_ACCESS_KEY_ID= +export AWS_SECRET_ACCESS_KEY= +./test.sh +``` + +The following options are available. + +| name | description | +|----------------------|-------------------------------------------------------------------------| +| test-type | Run tests of a test suite. [integ-test, bwc-test] | +| --test-run-id | Unique identifier for a test run | +| --s3-bucket | Artifact S3 bucket to pull manifests and dependencies | +| --opensearch-version | OpenSearch version | +| --build-id | Unique identifier for a build | +| --architecture | CPU architecture for all components | +| --component | Test a specific component in a manifest | +| --keep | Do not delete the temporary working directory on both success or error. | +| -v, --verbose | Show more verbose output. | + +##### Integration Tests + +This step runs integration tests invoking `run_integ_test.py` in each component from bundle manifest. + +To run integration tests locally, use below command. It pulls down the built bundle and its manifest file from S3, reads all components of the bundle and runs integration tests against each component. + +Usage: +```bash +./test.sh integ-test --test-run-id --s3-bucket --opensearch-version --build-id --architecture +``` +##### Backwards Compatibility Tests + +This step run backward compatibility invoking `run_bwc_test.py` in each component from bundle manifest. + +Usage: +```bash +./test.sh bwc-test --test-run-id --s3-bucket --opensearch-version --build-id --architecture +``` + +##### Performance Tests + +TODO + +#### Sanity Check the Bundle + +This workflow runs sanity checks on every component present in the bundle, executed as part of the [manifests workflow](/.github/workflows/manifests.yml) in this repostiory. It ensures that the component GitHub repositories are correct and versions in those components match the OpenSearch version. + +To use checks, nest them under `checks` in the manifest. + +```yaml +- name: common-utils + repository: https://github.com/opensearch-project/common-utils.git + ref: main + checks: + - gradle:publish + - gradle:properties:version + - gradle:dependencies:opensearch.version + - gradle:dependencies:opensearch.version: alerting +``` + +The following checks are available. + +| name | description | +|-----------------------------------------------|---------------------------------------------------------------| +| gradle:properties:version | Check version of the component. | +| gradle:dependencies:opensearch.version | Check dependency on the correct version of OpenSearch. | +| gradle:publish | Check that publishing to Maven local works, and publish. | + +The following example sanity-checks components in the the OpenSearch 1.1.0 manifest. + +```bash +./ci.sh manifests/1.1.0/opensearch-1.1.0.yml --snapshot +``` + +The following options are available. + +| name | description | +|--------------------|-------------------------------------------------------------------------| +| --component [name] | Test a single component by name, e.g. `--component common-utils`. | +| --keep | Do not delete the temporary working directory on both success or error. | +| -v, --verbose | Show more verbose output. | + +#### Auto-Generate Manifests + +The [manifests workflow](src/manifests_workflow) reacts to version increments in OpenSearch and its components by extracting Gradle properties from project branches. Currently OpenSearch `main`, and `x.y` branches are checked out one-by-one, published to local maven, and their versions extracted using `./gradlew properties`. When a new version is found, a new input manifest is added to [manifests](manifests), and [a pull request is opened](.github/workflows/manifests.yml) (e.g. [opensearch-build#491](https://github.com/opensearch-project/opensearch-build/pull/491)). + +Show information about existing manifests. + +```bash +./manifests.sh list +``` + +Check for updates and create any new manifests. + +```bash +./manifests.sh update +``` + +The following options are available. + +| name | description | +|--------------------|-------------------------------------------------------------------------| +| --keep | Do not delete the temporary working directory on both success or error. | +| -v, --verbose | Show more verbose output. | ### Making a Release diff --git a/bundle-workflow/assemble.sh b/assemble.sh similarity index 100% rename from bundle-workflow/assemble.sh rename to assemble.sh diff --git a/bundle-workflow/build.sh b/build.sh similarity index 100% rename from bundle-workflow/build.sh rename to build.sh diff --git a/bundle-workflow/README.md b/bundle-workflow/README.md deleted file mode 100644 index 793e6e318c..0000000000 --- a/bundle-workflow/README.md +++ /dev/null @@ -1,313 +0,0 @@ -- [OpenSearch Bundle Workflow](#opensearch-bundle-workflow) - - [How it works](#how-it-works) - - [OpenSearch](#opensearch) - - [OpenSearch Dashboards](#opensearch-dashboards) - - [CI CD Environment](#ci-cd-environment) - - [Build CI Runner Docker Image from Dockerfile](#build-ci-runner-docker-image-from-dockerfile) - - [Check Out Source](#check-out-source) - - [Build from Source](#build-from-source) - - [Custom Build Scripts](#custom-build-scripts) - - [Assemble the Bundle](#assemble-the-bundle) - - [Custom Install Scripts](#custom-install-scripts) - - [Sign Artifacts](#sign-artifacts) - - [Test the Bundle](#test-the-bundle) - - [Integration Tests](#integration-tests) - - [Backwards Compatibility Tests](#backwards-compatibility-tests) - - [Performance Tests](#performance-tests) - - [Sanity Check the Bundle](#sanity-check-the-bundle) - - [Auto-Generate Manifests](#auto-generate-manifests) - -## OpenSearch Bundle Workflow - -The bundle workflow builds a complete OpenSearch and OpenSearch Dashboards distribution from source. You can currently build 1.0, 1.1 and 1.1-SNAPSHOT. - -### How it works - -This system performs a top-down build of all components required for a specific OpenSearch and OpenSearch Dashboards bundle release. -The input to the system is a manifest that defines the order in which components should be built. -All manifests for our current releases are [here](/manifests). - -To build components we rely on a common entry-point in the form of a `build.sh` script. See [Custom Build Scripts](#custom-build-scripts). -Within each build script components have the option to place artifacts in a set of directories to be picked up and published on their behalf. These are - -| name | description | -|--------------------|----------------------------------------------------------------------------------------------------| -| /maven | Include any publications that should be pushed to maven | -| /plugins | Where a plugin zip should be placed. If included it will be installed during bundle assembly. | -| /core-plugins | Where plugins shipped from `https://github.com/opensearch-project/OpenSearch` should be placed | -| /bundle | Where the min bundle should be placed when built from `https://github.com/opensearch-project/OpenSearch`| -| /libs | Where any additional libs should be placed that are required during bundle assembly | - -#### OpenSearch - -The build order allows us to first publish `OpenSearch` followed by `common-utils` and publish these artifacts to maven local so that -they are available for each component. In order to ensure that the same versions are used, a `-Dopensearch.version` flag is passed to -each component's build script that defines which version the component should build against. - -#### OpenSearch Dashboards - -The build order allows us first pull down `OpenSearch Dashboards` and then utilize it to build other components. -*NOTE*: Building plugins requires having the core repository pulled down so it has access to bootstrap and build the modules utilized by plugins. - -### CI CD Environment - -We build, assemble, and test our artifacts on docker containers. All of our pipelines are using the same docker image for consistency. -We provide docker files in `dockerfiles/` folder, and images on [staging docker hub repositories](https://hub.docker.com/r/opensearchstaging/ci-runner/). - -#### Build CI Runner Docker Image from Dockerfile - -* If you only want to build the docker image for either x64 or arm64, run this on a x64 or arm64 host respectively: - ``` - docker build -f ./dockerfiles/integtest-runner.al2.dockerfile . -t /: - ``` - -* If you want to build multi-arch docker image for both x64 and arm64, make sure you are using Docker Desktop: - * Run these commands to setup the multi-arch builder, you can re-use this build later on, just need to re-bootstrap again if you restart Docker Desktop: - ``` - docker buildx create --name multiarch - docker buildx use multiarch - docker buildx inspect --bootstrap - ``` - - * You should be able to see similar output in `docker ps` like this: - ``` - 123456789012 moby/buildkit:buildx-stable-1 "buildkitd" 11 minutes ago Up 11 minutes buildx_buildkit_multiarch0 - ``` - - * Docker buildx is using a container to build multi-arch images and combine all the layers together, so you can only upload it to Docker Hub, - or save it locally as cache, means `docker images` will not show the image due to your host cannot have more than one CPU architecture. - - * Run these commands to actually build the docker image in multi-arch and push to Docker Hub (est. 1hr time depend on your host hardware specifications and network bandwidth): - ``` - docker buildx build --platform linux/amd64,linux/arm64 -t /: -f --push . - ``` - -### Check Out Source - -The [checkout workflow](src/checkout_workflow) checks out source code for a given manifest for further examination. - -```bash -./bundle-workflow/checkout.sh manfiests/1.1.0/opensearch-1.1.0.yml -``` - -The following options are available. - -| name | description | -|--------------------|-------------------------------------------------------------------------| -| -v, --verbose | Show more verbose output. | - - -### Build from Source - -Each build requires a manifest to be passed as input. We currently have the following input manifests. - -| name | description | -|-----------------------------------------------------------------------------|---------------------------------------------------------------| -| [opensearch-1.0.0.yml](/manifests/1.0.0/opensearch-1.0.0.yml) | Manifest to reproduce 1.0.0 build. | -| [opensearch-1.0.0-maven.yml](/manifests/1.0.0/opensearch-1.0.0-maven.yml) | One-time manifest to build maven artifacts for 1.0 from tags. | -| [opensearch-1.1.0.yml](/manifests/1.1.0/opensearch-1.1.0.yml) | Manifest for 1.1.0, the next version. | -| [opensearch-1.2.0.yml](/manifests/1.2.0/opensearch-1.2.0.yml) | Manifest for 1.2.0, the following version. | -| [opensearch-2.0.0.yml](/manifests/2.0.0/opensearch-2.0.0.yml) | Manifest for 2.0.0, the next major version of OpenSearch. | -| [opensearch-dashboards-1.1.0.yml](/manifests/1.1.0/opensearch-dashboards-1.1.0.yml) | Manifest for 1.1.0, the next version. - -The following example builds a snapshot version of OpenSearch 1.1.0. - -```bash -./bundle-workflow/build.sh manifests/1.1.0/opensearch-1.1.0.yml --snapshot -``` - -While the following builds a snapshot version of OpenSearch-Dashboards 1.1.0. - -```bash -./bundle-workflow/build.sh manifests/1.1.0/opensearch-dashboards-1.1.0.yml --snapshot -``` - -The [OpenSearch repo](https://github.com/opensearch-project/OpenSearch) is built first, followed by [common-utils](https://github.com/opensearch-project/common-utils), and all declared plugin repositories. These dependencies are published to maven local under `~/.m2`, and subsequent project builds pick those up. - -The [OpenSearch Dashboards repo](https://github.com/opensearch-project/OpenSearch-Dashboards) is built first, followed by all declared plugin repositories. - -All final output is placed into an `artifacts` folder along with a build output `manifest.yml` that contains output details. - -Artifacts will contain the following folders. - -``` -/artifacts - bundle/ <- contains opensearch or opensearch-dashboards min tarball - maven/ <- all built maven artifacts - plugins/ <- all built plugin zips - core-plugins/ <- all built core plugins zip - manifest.yml <- build manifest describing all built components and their artifacts -``` - -The following options are available in `bundle-workflow/build.sh`. - -| name | description | -|--------------------|-------------------------------------------------------------------------| -| --snapshot | Build a snapshot instead of a release artifact, default is `false`. | -| --component [name] | Rebuild a single component by name, e.g. `--component common-utils`. | -| --keep | Do not delete the temporary working directory on both success or error. | -| -v, --verbose | Show more verbose output. | - -#### Custom Build Scripts - -Each component build relies on a `build.sh` script that is used to prepare bundle artifacts for a particular bundle version that takes two arguments: version and target architecture. By default the tool will look for a script in [scripts/components](scripts/components), then in the checked-out repository in `build/build.sh`, then default to a Gradle build implemented in [scripts/default/build.sh](scripts/default/build.sh). - -### Assemble the Bundle - -```bash -./bundle-workflow/assemble.sh artifacts/manifest.yml -``` - -The bundling step takes output from the build step, installs plugins, and assembles a full bundle into a `bundle` folder. The input requires a path to the build manifest and is expected to be inside the `artifacts` directory that contains `bundle`, `maven`, `plugins` and `core-plugins` subdirectories from the build step. - -Artifacts will be updated as follows. - -``` -/bundle - .tar.gz <- assembled tarball - manifest.yml <- bundle manifest describing versions for the min bundle and all installed plugins and their locations -``` - -#### Custom Install Scripts - -You can perform additional plugin install steps by adding an `install.sh` script. By default the tool will look for a script in [scripts/bundle-build/components](scripts/bundle-build/components), then default to a noop version implemented in [scripts/default/install.sh](scripts/default/install.sh). - -### Sign Artifacts - -The signing step (optional) takes the manifest file created from the build step and signs all its component artifacts using a tool called `opensearch-signer-client` (in progress of being open-sourced). The input requires a path to the build manifest and is expected to be inside the artifacts directory with the same directories mentioned in the build step. - -The following options are available. - -| name | description | -|---------------|---------------------------------------------------------------------------------------| -| --component | The component name of the component whose artifacts will be signed. | -| --type | The artifact type to be signed. Currently one of 3 options: [plugins, maven, bundle]. | -| -v, --verbose | Show more verbose output. | - -The signed artifacts (.asc) will be found in the same location as the original artifact. - -The following command signs all artifacts. - -```bash -./bundle_workflow/sign.sh artifacts/manifest.yml -``` - -### Test the Bundle - -Tests the OpenSearch bundle. - -This workflow contains integration, backwards compatibility and performance tests. - -More details around how this workflow is instrumented as part of CI CD, are covered [here](src/test_workflow/README.md). - -Usage: -```bash -export AWS_ROLE_ARN=arn:aws:iam:::role/opensearch-test -export AWS_ROLE_SESSION_NAME=dummy-session - -export AWS_SESSION_TOKEN= -export AWS_ACCESS_KEY_ID= -export AWS_SECRET_ACCESS_KEY= -./bundle-workflow/test.sh -``` - -The following options are available. - -| name | description | -|----------------------|-------------------------------------------------------------------------| -| test-type | Run tests of a test suite. [integ-test, bwc-test] | -| --test-run-id | Unique identifier for a test run | -| --s3-bucket | Artifact S3 bucket to pull manifests and dependencies | -| --opensearch-version | OpenSearch version | -| --build-id | Unique identifier for a build | -| --architecture | CPU architecture for all components | -| --component | Test a specific component in a manifest | -| --keep | Do not delete the temporary working directory on both success or error. | -| -v, --verbose | Show more verbose output. | - -#### Integration Tests - -This step runs integration tests invoking `run_integ_test.py` in each component from bundle manifest. - -To run integration tests locally, use below command. It pulls down the built bundle and its manifest file from S3, reads all components of the bundle and runs integration tests against each component. - -Usage: -```bash -cd bundle-workflow -./test.sh integ-test --test-run-id --s3-bucket --opensearch-version --build-id --architecture -``` -#### Backwards Compatibility Tests - -This step run backward compatibility invoking `run_bwc_test.py` in each component from bundle manifest. - -Usage: -```bash -cd bundle-workflow -./test.sh bwc-test --test-run-id --s3-bucket --opensearch-version --build-id --architecture -``` - -#### Performance Tests - -TODO - -### Sanity Check the Bundle - -This workflow runs sanity checks on every component present in the bundle, executed as part of the [manifests workflow](/.github/workflows/manifests.yml) in this repostiory. It ensures that the component GitHub repositories are correct and versions in those components match the OpenSearch version. - -To use checks, nest them under `checks` in the manifest. - -```yaml -- name: common-utils - repository: https://github.com/opensearch-project/common-utils.git - ref: main - checks: - - gradle:publish - - gradle:properties:version - - gradle:dependencies:opensearch.version - - gradle:dependencies:opensearch.version: alerting -``` - -The following checks are available. - -| name | description | -|-----------------------------------------------|---------------------------------------------------------------| -| gradle:properties:version | Check version of the component. | -| gradle:dependencies:opensearch.version | Check dependency on the correct version of OpenSearch. | -| gradle:publish | Check that publishing to Maven local works, and publish. | - -The following example sanity-checks components in the the OpenSearch 1.1.0 manifest. - -```bash -./bundle-workflow/ci.sh manifests/1.1.0/opensearch-1.1.0.yml --snapshot -``` - -The following options are available. - -| name | description | -|--------------------|-------------------------------------------------------------------------| -| --component [name] | Test a single component by name, e.g. `--component common-utils`. | -| --keep | Do not delete the temporary working directory on both success or error. | -| -v, --verbose | Show more verbose output. | - -### Auto-Generate Manifests - -The [manifests workflow](src/manifests_workflow) reacts to version increments in OpenSearch and its components by extracting Gradle properties from project branches. Currently OpenSearch `main`, and `x.y` branches are checked out one-by-one, published to local maven, and their versions extracted using `./gradlew properties`. When a new version is found, a new input manifest is added to [manifests](../manifests), and [a pull request is opened](../.github/workflows/manifests.yml) (e.g. [opensearch-build#491](https://github.com/opensearch-project/opensearch-build/pull/491)). - -Show information about existing manifests. - -```bash -./bundle-workflow/manifests.sh list -``` - -Check for updates and create any new manifests. - -```bash -./bundle-workflow/manifests.sh update -``` - -The following options are available. - -| name | description | -|--------------------|-------------------------------------------------------------------------| -| --keep | Do not delete the temporary working directory on both success or error. | -| -v, --verbose | Show more verbose output. | diff --git a/bundle-workflow/scripts/README.md b/bundle-workflow/scripts/README.md deleted file mode 100644 index 85adeed581..0000000000 --- a/bundle-workflow/scripts/README.md +++ /dev/null @@ -1 +0,0 @@ -Scripts invoked by [bundle-workflow](../). \ No newline at end of file diff --git a/bundle-workflow/checkout.sh b/checkout.sh similarity index 100% rename from bundle-workflow/checkout.sh rename to checkout.sh diff --git a/bundle-workflow/ci.sh b/ci.sh similarity index 100% rename from bundle-workflow/ci.sh rename to ci.sh diff --git a/bundle-workflow/docker.md b/docker.md similarity index 100% rename from bundle-workflow/docker.md rename to docker.md diff --git a/bundle-workflow/dockerfiles/ci-runner.al2.dockerfile b/docker/ci-runner.al2.dockerfile similarity index 100% rename from bundle-workflow/dockerfiles/ci-runner.al2.dockerfile rename to docker/ci-runner.al2.dockerfile diff --git a/bundle-workflow/dockerfiles/ci-runner.centos7.dockerfile b/docker/ci-runner.centos7.dockerfile similarity index 100% rename from bundle-workflow/dockerfiles/ci-runner.centos7.dockerfile rename to docker/ci-runner.centos7.dockerfile diff --git a/bundle-workflow/jenkins_workflow/test/README.md b/jenkins/test/README.md similarity index 100% rename from bundle-workflow/jenkins_workflow/test/README.md rename to jenkins/test/README.md diff --git a/bundle-workflow/jenkins_workflow/test/orchestrator/Jenkinsfile b/jenkins/test/orchestrator/Jenkinsfile similarity index 100% rename from bundle-workflow/jenkins_workflow/test/orchestrator/Jenkinsfile rename to jenkins/test/orchestrator/Jenkinsfile diff --git a/bundle-workflow/jenkins_workflow/test/testsuite/Jenkinsfile b/jenkins/test/testsuite/Jenkinsfile similarity index 91% rename from bundle-workflow/jenkins_workflow/test/testsuite/Jenkinsfile rename to jenkins/test/testsuite/Jenkinsfile index e47b841128..a023d87623 100644 --- a/bundle-workflow/jenkins_workflow/test/testsuite/Jenkinsfile +++ b/jenkins/test/testsuite/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { } } steps { - sh "./bundle-workflow/test.sh ${JOB_NAME} --s3-bucket ${ARTIFACT_BUCKET_NAME} --opensearch-version ${opensearch_version} --build-id ${build_id} --architecture ${architecture} --test-run-id ${test_run_id}" + sh "./test.sh ${JOB_NAME} --s3-bucket ${ARTIFACT_BUCKET_NAME} --opensearch-version ${opensearch_version} --build-id ${build_id} --architecture ${architecture} --test-run-id ${test_run_id}" } post() { always { diff --git a/bundle-workflow/manifests.sh b/manifests.sh similarity index 100% rename from bundle-workflow/manifests.sh rename to manifests.sh diff --git a/bundle-workflow/pytest.ini b/pytest.ini similarity index 100% rename from bundle-workflow/pytest.ini rename to pytest.ini diff --git a/release/docker/README.md b/release/docker/README.md index 28c5b91f17..7369e84ff9 100644 --- a/release/docker/README.md +++ b/release/docker/README.md @@ -37,28 +37,28 @@ For multi-arch image (currently support x64/arm64) you need to install Docker De * Build single-arch image with these command: * OpenSearch 1.0.0 x64: ``` - ./build-image-single-arch.sh -v 1.0.0 -f ./dockerfiles/opensearch.al2.dockerfile -p opensearch -a x64 + ./build-image-single-arch.sh -v 1.0.0 -f ./docker/opensearch.al2.dockerfile -p opensearch -a x64 ``` * OpenSearch 1.0.0 arm64 with local tarball: ``` - ./build-image-single-arch.sh -v 1.0.0 -f ./dockerfiles/opensearch.al2.dockerfile -p opensearch -a arm64 -t opensearch-1.0.0.tar.gz + ./build-image-single-arch.sh -v 1.0.0 -f ./docker/opensearch.al2.dockerfile -p opensearch -a arm64 -t opensearch-1.0.0.tar.gz ``` * OpenSearch-Dashboards 1.0.0 x64: ``` - ./build-image-single-arch.sh -v 1.0.0 -f ./dockerfiles/opensearch-dashboards.al2.dockerfile -p opensearch-dashboards -a x64 + ./build-image-single-arch.sh -v 1.0.0 -f ./docker/opensearch-dashboards.al2.dockerfile -p opensearch-dashboards -a x64 ``` * OpenSearch-Dashboards 1.0.0 arm64 with local tarball: ``` - ./build-image-single-arch.sh -v 1.0.0 -f ./dockerfiles/opensearch-dashboards.al2.dockerfile -p opensearch-dashboards -a arm64 -t opensearch-dashboards-1.0.0.tar.gz + ./build-image-single-arch.sh -v 1.0.0 -f ./docker/opensearch-dashboards.al2.dockerfile -p opensearch-dashboards -a arm64 -t opensearch-dashboards-1.0.0.tar.gz ``` * Build multi-arch image with this commands (only support x64 + arm64 in one image for now), the image will immediately uploaded to a docker registry so you need to provide docker repo name: * OpenSearch 1.0.0: ``` - ./build-image-multi-arch.sh -v 1.0.0 -f ./dockerfiles/opensearch.al2.dockerfile -p opensearch -a "x64,arm64" -r "/:" + ./build-image-multi-arch.sh -v 1.0.0 -f ./docker/opensearch.al2.dockerfile -p opensearch -a "x64,arm64" -r "/:" ``` * OpenSearch-Dashboards 1.0.0 with local tarball(s): ``` - ./build-image-multi-arch.sh -v 1.0.0 -f ./dockerfiles/opensearch-dashboards.al2.dockerfile -p opensearch-dashboards -a "x64,arm64" -r "/:" -t "opensearch-1.0.0.tar.gz,opensearch-dashboards-1.0.0.tar.gz" + ./build-image-multi-arch.sh -v 1.0.0 -f ./docker/opensearch-dashboards.al2.dockerfile -p opensearch-dashboards -a "x64,arm64" -r "/:" -t "opensearch-1.0.0.tar.gz,opensearch-dashboards-1.0.0.tar.gz" ``` ### Disable Security Plugin, Security Dashboards Plugin, Security Demo Configurations and Related Configurations diff --git a/bundle-workflow/run.sh b/run.sh similarity index 100% rename from bundle-workflow/run.sh rename to run.sh diff --git a/scripts/README.md b/scripts/README.md index 35943ffbe8..5b678a0eca 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -1,10 +1,26 @@ +- [Scripts](#scripts) + - [Bundle Workflow](#bundle-workflow) + - [Legacy Scripts](#legacy-scripts) + - [Run Deployment Script](#run-deployment-script) + - [Requirements](#requirements) + - [Usage](#usage) + ## Scripts -This folder contains several scripts which are used in either tar/docker or legacy github actions. -### Run deployment script +### Bundle Workflow + +This folder contains default and custom scripts located by [src/paths/script_finder.py](ScriptFinder). + +### Legacy Scripts + +This folder contains the following scripts which are used in either tar/docker or legacy github actions. + +#### Run Deployment Script + This is a script to deploy a single node OpenSearch + OpenSearch-Dashboards cluster to a x64 or arm64 host. -#### Requirements +##### Requirements + * If you are using LINUX host to run dockerd, provision container based on the dockerfile, and execute integTest: * You must run these commands on the LINUX host for OpenSearch process to run: ``` @@ -41,7 +57,7 @@ This is a script to deploy a single node OpenSearch + OpenSearch-Dashboards clus sudo systemctl start docker ``` -#### Usages +##### Usage * If you are using macOS host to run Docker Desktop, provision container based on the dockerfile, and execute integTest: * You must change docker memory/RAM utilization in resources settings if you use Docker Desktop on macOS. diff --git a/bundle-workflow/scripts/components/OpenSearch-Dashboards/build.sh b/scripts/components/OpenSearch-Dashboards/build.sh similarity index 100% rename from bundle-workflow/scripts/components/OpenSearch-Dashboards/build.sh rename to scripts/components/OpenSearch-Dashboards/build.sh diff --git a/bundle-workflow/scripts/components/OpenSearch/build.sh b/scripts/components/OpenSearch/build.sh similarity index 100% rename from bundle-workflow/scripts/components/OpenSearch/build.sh rename to scripts/components/OpenSearch/build.sh diff --git a/bundle-workflow/scripts/components/OpenSearch/integtest.sh b/scripts/components/OpenSearch/integtest.sh similarity index 100% rename from bundle-workflow/scripts/components/OpenSearch/integtest.sh rename to scripts/components/OpenSearch/integtest.sh diff --git a/bundle-workflow/scripts/components/README.md b/scripts/components/README.md similarity index 100% rename from bundle-workflow/scripts/components/README.md rename to scripts/components/README.md diff --git a/bundle-workflow/scripts/components/alerting/build.sh b/scripts/components/alerting/build.sh similarity index 100% rename from bundle-workflow/scripts/components/alerting/build.sh rename to scripts/components/alerting/build.sh diff --git a/bundle-workflow/scripts/components/alerting/integtest.sh b/scripts/components/alerting/integtest.sh similarity index 100% rename from bundle-workflow/scripts/components/alerting/integtest.sh rename to scripts/components/alerting/integtest.sh diff --git a/bundle-workflow/scripts/components/common-utils/build.sh b/scripts/components/common-utils/build.sh similarity index 100% rename from bundle-workflow/scripts/components/common-utils/build.sh rename to scripts/components/common-utils/build.sh diff --git a/bundle-workflow/scripts/components/job-scheduler/build.sh b/scripts/components/job-scheduler/build.sh similarity index 100% rename from bundle-workflow/scripts/components/job-scheduler/build.sh rename to scripts/components/job-scheduler/build.sh diff --git a/bundle-workflow/scripts/components/k-NN/build.sh b/scripts/components/k-NN/build.sh similarity index 100% rename from bundle-workflow/scripts/components/k-NN/build.sh rename to scripts/components/k-NN/build.sh diff --git a/bundle-workflow/scripts/components/k-NN/install.sh b/scripts/components/k-NN/install.sh similarity index 100% rename from bundle-workflow/scripts/components/k-NN/install.sh rename to scripts/components/k-NN/install.sh diff --git a/bundle-workflow/scripts/components/notifications/build.sh b/scripts/components/notifications/build.sh similarity index 100% rename from bundle-workflow/scripts/components/notifications/build.sh rename to scripts/components/notifications/build.sh diff --git a/bundle-workflow/scripts/components/performance-analyzer-rca/build.sh b/scripts/components/performance-analyzer-rca/build.sh similarity index 100% rename from bundle-workflow/scripts/components/performance-analyzer-rca/build.sh rename to scripts/components/performance-analyzer-rca/build.sh diff --git a/bundle-workflow/scripts/components/performance-analyzer/build.sh b/scripts/components/performance-analyzer/build.sh similarity index 100% rename from bundle-workflow/scripts/components/performance-analyzer/build.sh rename to scripts/components/performance-analyzer/build.sh diff --git a/bundle-workflow/scripts/components/performance-analyzer/install.sh b/scripts/components/performance-analyzer/install.sh similarity index 100% rename from bundle-workflow/scripts/components/performance-analyzer/install.sh rename to scripts/components/performance-analyzer/install.sh diff --git a/bundle-workflow/scripts/components/security/build.sh b/scripts/components/security/build.sh similarity index 100% rename from bundle-workflow/scripts/components/security/build.sh rename to scripts/components/security/build.sh diff --git a/bundle-workflow/scripts/default/bwctest.sh b/scripts/default/bwctest.sh similarity index 100% rename from bundle-workflow/scripts/default/bwctest.sh rename to scripts/default/bwctest.sh diff --git a/bundle-workflow/scripts/default/install.sh b/scripts/default/install.sh similarity index 100% rename from bundle-workflow/scripts/default/install.sh rename to scripts/default/install.sh diff --git a/bundle-workflow/scripts/default/integtest.sh b/scripts/default/integtest.sh similarity index 100% rename from bundle-workflow/scripts/default/integtest.sh rename to scripts/default/integtest.sh diff --git a/bundle-workflow/scripts/default/opensearch-dashboards/build.sh b/scripts/default/opensearch-dashboards/build.sh similarity index 100% rename from bundle-workflow/scripts/default/opensearch-dashboards/build.sh rename to scripts/default/opensearch-dashboards/build.sh diff --git a/bundle-workflow/scripts/default/opensearch/build.sh b/scripts/default/opensearch/build.sh similarity index 100% rename from bundle-workflow/scripts/default/opensearch/build.sh rename to scripts/default/opensearch/build.sh diff --git a/bundle-workflow/sign.sh b/sign.sh similarity index 100% rename from bundle-workflow/sign.sh rename to sign.sh diff --git a/bundle-workflow/src/assemble_workflow/__init__.py b/src/assemble_workflow/__init__.py similarity index 100% rename from bundle-workflow/src/assemble_workflow/__init__.py rename to src/assemble_workflow/__init__.py diff --git a/bundle-workflow/src/assemble_workflow/bundle.py b/src/assemble_workflow/bundle.py similarity index 100% rename from bundle-workflow/src/assemble_workflow/bundle.py rename to src/assemble_workflow/bundle.py diff --git a/bundle-workflow/src/assemble_workflow/bundle_opensearch.py b/src/assemble_workflow/bundle_opensearch.py similarity index 100% rename from bundle-workflow/src/assemble_workflow/bundle_opensearch.py rename to src/assemble_workflow/bundle_opensearch.py diff --git a/bundle-workflow/src/assemble_workflow/bundle_opensearch_dashboards.py b/src/assemble_workflow/bundle_opensearch_dashboards.py similarity index 100% rename from bundle-workflow/src/assemble_workflow/bundle_opensearch_dashboards.py rename to src/assemble_workflow/bundle_opensearch_dashboards.py diff --git a/bundle-workflow/src/assemble_workflow/bundle_recorder.py b/src/assemble_workflow/bundle_recorder.py similarity index 100% rename from bundle-workflow/src/assemble_workflow/bundle_recorder.py rename to src/assemble_workflow/bundle_recorder.py diff --git a/bundle-workflow/src/assemble_workflow/bundles.py b/src/assemble_workflow/bundles.py similarity index 100% rename from bundle-workflow/src/assemble_workflow/bundles.py rename to src/assemble_workflow/bundles.py diff --git a/bundle-workflow/src/aws/__init__.py b/src/aws/__init__.py similarity index 100% rename from bundle-workflow/src/aws/__init__.py rename to src/aws/__init__.py diff --git a/bundle-workflow/src/aws/s3_bucket.py b/src/aws/s3_bucket.py similarity index 100% rename from bundle-workflow/src/aws/s3_bucket.py rename to src/aws/s3_bucket.py diff --git a/bundle-workflow/src/build_workflow/__init__.py b/src/build_workflow/__init__.py similarity index 100% rename from bundle-workflow/src/build_workflow/__init__.py rename to src/build_workflow/__init__.py diff --git a/bundle-workflow/src/build_workflow/build_args.py b/src/build_workflow/build_args.py similarity index 100% rename from bundle-workflow/src/build_workflow/build_args.py rename to src/build_workflow/build_args.py diff --git a/bundle-workflow/src/build_workflow/build_artifact_check.py b/src/build_workflow/build_artifact_check.py similarity index 100% rename from bundle-workflow/src/build_workflow/build_artifact_check.py rename to src/build_workflow/build_artifact_check.py diff --git a/bundle-workflow/src/build_workflow/build_artifact_checks.py b/src/build_workflow/build_artifact_checks.py similarity index 100% rename from bundle-workflow/src/build_workflow/build_artifact_checks.py rename to src/build_workflow/build_artifact_checks.py diff --git a/bundle-workflow/src/build_workflow/build_recorder.py b/src/build_workflow/build_recorder.py similarity index 100% rename from bundle-workflow/src/build_workflow/build_recorder.py rename to src/build_workflow/build_recorder.py diff --git a/bundle-workflow/src/build_workflow/build_target.py b/src/build_workflow/build_target.py similarity index 100% rename from bundle-workflow/src/build_workflow/build_target.py rename to src/build_workflow/build_target.py diff --git a/bundle-workflow/src/build_workflow/builder.py b/src/build_workflow/builder.py similarity index 100% rename from bundle-workflow/src/build_workflow/builder.py rename to src/build_workflow/builder.py diff --git a/bundle-workflow/src/build_workflow/opensearch/__init__.py b/src/build_workflow/opensearch/__init__.py similarity index 100% rename from bundle-workflow/src/build_workflow/opensearch/__init__.py rename to src/build_workflow/opensearch/__init__.py diff --git a/bundle-workflow/src/build_workflow/opensearch/build_artifact_check_maven.py b/src/build_workflow/opensearch/build_artifact_check_maven.py similarity index 100% rename from bundle-workflow/src/build_workflow/opensearch/build_artifact_check_maven.py rename to src/build_workflow/opensearch/build_artifact_check_maven.py diff --git a/bundle-workflow/src/build_workflow/opensearch/build_artifact_check_plugin.py b/src/build_workflow/opensearch/build_artifact_check_plugin.py similarity index 100% rename from bundle-workflow/src/build_workflow/opensearch/build_artifact_check_plugin.py rename to src/build_workflow/opensearch/build_artifact_check_plugin.py diff --git a/bundle-workflow/src/build_workflow/opensearch_dashboards/__init__.py b/src/build_workflow/opensearch_dashboards/__init__.py similarity index 100% rename from bundle-workflow/src/build_workflow/opensearch_dashboards/__init__.py rename to src/build_workflow/opensearch_dashboards/__init__.py diff --git a/bundle-workflow/src/build_workflow/opensearch_dashboards/build_artifact_check_plugin.py b/src/build_workflow/opensearch_dashboards/build_artifact_check_plugin.py similarity index 100% rename from bundle-workflow/src/build_workflow/opensearch_dashboards/build_artifact_check_plugin.py rename to src/build_workflow/opensearch_dashboards/build_artifact_check_plugin.py diff --git a/bundle-workflow/src/checkout_workflow/__init__.py b/src/checkout_workflow/__init__.py similarity index 100% rename from bundle-workflow/src/checkout_workflow/__init__.py rename to src/checkout_workflow/__init__.py diff --git a/bundle-workflow/src/checkout_workflow/checkout_args.py b/src/checkout_workflow/checkout_args.py similarity index 100% rename from bundle-workflow/src/checkout_workflow/checkout_args.py rename to src/checkout_workflow/checkout_args.py diff --git a/bundle-workflow/src/ci_workflow/__init__.py b/src/ci_workflow/__init__.py similarity index 100% rename from bundle-workflow/src/ci_workflow/__init__.py rename to src/ci_workflow/__init__.py diff --git a/bundle-workflow/src/ci_workflow/ci.py b/src/ci_workflow/ci.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci.py rename to src/ci_workflow/ci.py diff --git a/bundle-workflow/src/ci_workflow/ci_args.py b/src/ci_workflow/ci_args.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci_args.py rename to src/ci_workflow/ci_args.py diff --git a/bundle-workflow/src/ci_workflow/ci_check.py b/src/ci_workflow/ci_check.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci_check.py rename to src/ci_workflow/ci_check.py diff --git a/bundle-workflow/src/ci_workflow/ci_check_gradle_dependencies.py b/src/ci_workflow/ci_check_gradle_dependencies.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci_check_gradle_dependencies.py rename to src/ci_workflow/ci_check_gradle_dependencies.py diff --git a/bundle-workflow/src/ci_workflow/ci_check_gradle_dependencies_opensearch.py b/src/ci_workflow/ci_check_gradle_dependencies_opensearch.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci_check_gradle_dependencies_opensearch.py rename to src/ci_workflow/ci_check_gradle_dependencies_opensearch.py diff --git a/bundle-workflow/src/ci_workflow/ci_check_gradle_properties.py b/src/ci_workflow/ci_check_gradle_properties.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci_check_gradle_properties.py rename to src/ci_workflow/ci_check_gradle_properties.py diff --git a/bundle-workflow/src/ci_workflow/ci_check_gradle_properties_version.py b/src/ci_workflow/ci_check_gradle_properties_version.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci_check_gradle_properties_version.py rename to src/ci_workflow/ci_check_gradle_properties_version.py diff --git a/bundle-workflow/src/ci_workflow/ci_check_gradle_publish_to_maven_local.py b/src/ci_workflow/ci_check_gradle_publish_to_maven_local.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci_check_gradle_publish_to_maven_local.py rename to src/ci_workflow/ci_check_gradle_publish_to_maven_local.py diff --git a/bundle-workflow/src/ci_workflow/ci_target.py b/src/ci_workflow/ci_target.py similarity index 100% rename from bundle-workflow/src/ci_workflow/ci_target.py rename to src/ci_workflow/ci_target.py diff --git a/bundle-workflow/src/git/__init__.py b/src/git/__init__.py similarity index 100% rename from bundle-workflow/src/git/__init__.py rename to src/git/__init__.py diff --git a/bundle-workflow/src/git/git_repository.py b/src/git/git_repository.py similarity index 100% rename from bundle-workflow/src/git/git_repository.py rename to src/git/git_repository.py diff --git a/bundle-workflow/src/manifests/__init__.py b/src/manifests/__init__.py similarity index 100% rename from bundle-workflow/src/manifests/__init__.py rename to src/manifests/__init__.py diff --git a/bundle-workflow/src/manifests/build_manifest.py b/src/manifests/build_manifest.py similarity index 100% rename from bundle-workflow/src/manifests/build_manifest.py rename to src/manifests/build_manifest.py diff --git a/bundle-workflow/src/manifests/bundle_manifest.py b/src/manifests/bundle_manifest.py similarity index 100% rename from bundle-workflow/src/manifests/bundle_manifest.py rename to src/manifests/bundle_manifest.py diff --git a/bundle-workflow/src/manifests/input_manifest.py b/src/manifests/input_manifest.py similarity index 100% rename from bundle-workflow/src/manifests/input_manifest.py rename to src/manifests/input_manifest.py diff --git a/bundle-workflow/src/manifests/input_manifests.py b/src/manifests/input_manifests.py similarity index 100% rename from bundle-workflow/src/manifests/input_manifests.py rename to src/manifests/input_manifests.py diff --git a/bundle-workflow/src/manifests/manifest.py b/src/manifests/manifest.py similarity index 100% rename from bundle-workflow/src/manifests/manifest.py rename to src/manifests/manifest.py diff --git a/bundle-workflow/src/manifests/manifests.py b/src/manifests/manifests.py similarity index 94% rename from bundle-workflow/src/manifests/manifests.py rename to src/manifests/manifests.py index 3045ed105d..c6e049661c 100644 --- a/bundle-workflow/src/manifests/manifests.py +++ b/src/manifests/manifests.py @@ -30,7 +30,7 @@ def __append__(self, files): @property def manifests_path(self): return os.path.realpath( - os.path.join(os.path.dirname(__file__), "../../../manifests") + os.path.join(os.path.dirname(__file__), "../../manifests") ) @property diff --git a/bundle-workflow/src/manifests/test_manifest.py b/src/manifests/test_manifest.py similarity index 100% rename from bundle-workflow/src/manifests/test_manifest.py rename to src/manifests/test_manifest.py diff --git a/bundle-workflow/src/manifests_workflow/__init__.py b/src/manifests_workflow/__init__.py similarity index 100% rename from bundle-workflow/src/manifests_workflow/__init__.py rename to src/manifests_workflow/__init__.py diff --git a/bundle-workflow/src/manifests_workflow/component.py b/src/manifests_workflow/component.py similarity index 100% rename from bundle-workflow/src/manifests_workflow/component.py rename to src/manifests_workflow/component.py diff --git a/bundle-workflow/src/manifests_workflow/component_opensearch.py b/src/manifests_workflow/component_opensearch.py similarity index 100% rename from bundle-workflow/src/manifests_workflow/component_opensearch.py rename to src/manifests_workflow/component_opensearch.py diff --git a/bundle-workflow/src/manifests_workflow/component_opensearch_min.py b/src/manifests_workflow/component_opensearch_min.py similarity index 100% rename from bundle-workflow/src/manifests_workflow/component_opensearch_min.py rename to src/manifests_workflow/component_opensearch_min.py diff --git a/bundle-workflow/src/manifests_workflow/input_manifests.py b/src/manifests_workflow/input_manifests.py similarity index 98% rename from bundle-workflow/src/manifests_workflow/input_manifests.py rename to src/manifests_workflow/input_manifests.py index b9737ed38e..3146bede3f 100644 --- a/bundle-workflow/src/manifests_workflow/input_manifests.py +++ b/src/manifests_workflow/input_manifests.py @@ -24,7 +24,7 @@ def __init__(self): @classmethod def manifests_path(self): return os.path.realpath( - os.path.join(os.path.dirname(__file__), "../../../manifests") + os.path.join(os.path.dirname(__file__), "../../manifests") ) @classmethod diff --git a/bundle-workflow/src/manifests_workflow/manifests_args.py b/src/manifests_workflow/manifests_args.py similarity index 100% rename from bundle-workflow/src/manifests_workflow/manifests_args.py rename to src/manifests_workflow/manifests_args.py diff --git a/bundle-workflow/src/paths/__init__.py b/src/paths/__init__.py similarity index 100% rename from bundle-workflow/src/paths/__init__.py rename to src/paths/__init__.py diff --git a/bundle-workflow/src/paths/script_finder.py b/src/paths/script_finder.py similarity index 100% rename from bundle-workflow/src/paths/script_finder.py rename to src/paths/script_finder.py diff --git a/bundle-workflow/src/paths/tree_walker.py b/src/paths/tree_walker.py similarity index 100% rename from bundle-workflow/src/paths/tree_walker.py rename to src/paths/tree_walker.py diff --git a/bundle-workflow/src/run_assemble.py b/src/run_assemble.py similarity index 97% rename from bundle-workflow/src/run_assemble.py rename to src/run_assemble.py index d1adeca97f..b7e3368774 100755 --- a/bundle-workflow/src/run_assemble.py +++ b/src/run_assemble.py @@ -38,7 +38,7 @@ def main(): tarball_installation_script = os.path.realpath( os.path.join( os.path.dirname(os.path.abspath(__file__)), - "../../release/tar/linux/opensearch-tar-install.sh", + "../release/tar/linux/opensearch-tar-install.sh", ) ) if not os.path.isfile(tarball_installation_script): diff --git a/bundle-workflow/src/run_build.py b/src/run_build.py similarity index 100% rename from bundle-workflow/src/run_build.py rename to src/run_build.py diff --git a/bundle-workflow/src/run_bwc_test.py b/src/run_bwc_test.py similarity index 100% rename from bundle-workflow/src/run_bwc_test.py rename to src/run_bwc_test.py diff --git a/bundle-workflow/src/run_checkout.py b/src/run_checkout.py similarity index 100% rename from bundle-workflow/src/run_checkout.py rename to src/run_checkout.py diff --git a/bundle-workflow/src/run_ci.py b/src/run_ci.py similarity index 100% rename from bundle-workflow/src/run_ci.py rename to src/run_ci.py diff --git a/bundle-workflow/src/run_integ_test.py b/src/run_integ_test.py similarity index 100% rename from bundle-workflow/src/run_integ_test.py rename to src/run_integ_test.py diff --git a/bundle-workflow/src/run_manifests.py b/src/run_manifests.py similarity index 100% rename from bundle-workflow/src/run_manifests.py rename to src/run_manifests.py diff --git a/bundle-workflow/src/run_perf_test.py b/src/run_perf_test.py similarity index 100% rename from bundle-workflow/src/run_perf_test.py rename to src/run_perf_test.py diff --git a/bundle-workflow/src/run_sign.py b/src/run_sign.py similarity index 100% rename from bundle-workflow/src/run_sign.py rename to src/run_sign.py diff --git a/bundle-workflow/src/sign_workflow/__init__.py b/src/sign_workflow/__init__.py similarity index 100% rename from bundle-workflow/src/sign_workflow/__init__.py rename to src/sign_workflow/__init__.py diff --git a/bundle-workflow/src/sign_workflow/signer.py b/src/sign_workflow/signer.py similarity index 100% rename from bundle-workflow/src/sign_workflow/signer.py rename to src/sign_workflow/signer.py diff --git a/bundle-workflow/src/system/__init__.py b/src/system/__init__.py similarity index 100% rename from bundle-workflow/src/system/__init__.py rename to src/system/__init__.py diff --git a/bundle-workflow/src/system/arch.py b/src/system/arch.py similarity index 100% rename from bundle-workflow/src/system/arch.py rename to src/system/arch.py diff --git a/bundle-workflow/src/system/config_file.py b/src/system/config_file.py similarity index 100% rename from bundle-workflow/src/system/config_file.py rename to src/system/config_file.py diff --git a/bundle-workflow/src/system/console.py b/src/system/console.py similarity index 100% rename from bundle-workflow/src/system/console.py rename to src/system/console.py diff --git a/bundle-workflow/src/system/execute.py b/src/system/execute.py similarity index 100% rename from bundle-workflow/src/system/execute.py rename to src/system/execute.py diff --git a/bundle-workflow/src/system/properties_file.py b/src/system/properties_file.py similarity index 100% rename from bundle-workflow/src/system/properties_file.py rename to src/system/properties_file.py diff --git a/bundle-workflow/src/system/temporary_directory.py b/src/system/temporary_directory.py similarity index 100% rename from bundle-workflow/src/system/temporary_directory.py rename to src/system/temporary_directory.py diff --git a/bundle-workflow/src/system/working_directory.py b/src/system/working_directory.py similarity index 100% rename from bundle-workflow/src/system/working_directory.py rename to src/system/working_directory.py diff --git a/bundle-workflow/src/test_workflow/README.md b/src/test_workflow/README.md similarity index 100% rename from bundle-workflow/src/test_workflow/README.md rename to src/test_workflow/README.md diff --git a/bundle-workflow/src/test_workflow/__init__.py b/src/test_workflow/__init__.py similarity index 100% rename from bundle-workflow/src/test_workflow/__init__.py rename to src/test_workflow/__init__.py diff --git a/bundle-workflow/src/test_workflow/bwc_test/__init__.py b/src/test_workflow/bwc_test/__init__.py similarity index 100% rename from bundle-workflow/src/test_workflow/bwc_test/__init__.py rename to src/test_workflow/bwc_test/__init__.py diff --git a/bundle-workflow/src/test_workflow/bwc_test/bwc_test_suite.py b/src/test_workflow/bwc_test/bwc_test_suite.py similarity index 100% rename from bundle-workflow/src/test_workflow/bwc_test/bwc_test_suite.py rename to src/test_workflow/bwc_test/bwc_test_suite.py diff --git a/bundle-workflow/src/test_workflow/config/test_manifest.yml b/src/test_workflow/config/test_manifest.yml similarity index 100% rename from bundle-workflow/src/test_workflow/config/test_manifest.yml rename to src/test_workflow/config/test_manifest.yml diff --git a/bundle-workflow/src/test_workflow/dependency_installer.py b/src/test_workflow/dependency_installer.py similarity index 100% rename from bundle-workflow/src/test_workflow/dependency_installer.py rename to src/test_workflow/dependency_installer.py diff --git a/bundle-workflow/src/test_workflow/img/test_workflow.png b/src/test_workflow/img/test_workflow.png similarity index 100% rename from bundle-workflow/src/test_workflow/img/test_workflow.png rename to src/test_workflow/img/test_workflow.png diff --git a/bundle-workflow/src/test_workflow/integ_test/__init__.py b/src/test_workflow/integ_test/__init__.py similarity index 100% rename from bundle-workflow/src/test_workflow/integ_test/__init__.py rename to src/test_workflow/integ_test/__init__.py diff --git a/bundle-workflow/src/test_workflow/integ_test/integ_test_suite.py b/src/test_workflow/integ_test/integ_test_suite.py similarity index 100% rename from bundle-workflow/src/test_workflow/integ_test/integ_test_suite.py rename to src/test_workflow/integ_test/integ_test_suite.py diff --git a/bundle-workflow/src/test_workflow/integ_test/local_test_cluster.py b/src/test_workflow/integ_test/local_test_cluster.py similarity index 100% rename from bundle-workflow/src/test_workflow/integ_test/local_test_cluster.py rename to src/test_workflow/integ_test/local_test_cluster.py diff --git a/bundle-workflow/src/test_workflow/perf_test/__init__.py b/src/test_workflow/perf_test/__init__.py similarity index 100% rename from bundle-workflow/src/test_workflow/perf_test/__init__.py rename to src/test_workflow/perf_test/__init__.py diff --git a/bundle-workflow/src/test_workflow/perf_test/perf_test_cluster.py b/src/test_workflow/perf_test/perf_test_cluster.py similarity index 100% rename from bundle-workflow/src/test_workflow/perf_test/perf_test_cluster.py rename to src/test_workflow/perf_test/perf_test_cluster.py diff --git a/bundle-workflow/src/test_workflow/perf_test/perf_test_suite.py b/src/test_workflow/perf_test/perf_test_suite.py similarity index 100% rename from bundle-workflow/src/test_workflow/perf_test/perf_test_suite.py rename to src/test_workflow/perf_test/perf_test_suite.py diff --git a/bundle-workflow/src/test_workflow/test_args.py b/src/test_workflow/test_args.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_args.py rename to src/test_workflow/test_args.py diff --git a/bundle-workflow/src/test_workflow/test_cluster.py b/src/test_workflow/test_cluster.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_cluster.py rename to src/test_workflow/test_cluster.py diff --git a/bundle-workflow/src/test_workflow/test_component.py b/src/test_workflow/test_component.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_component.py rename to src/test_workflow/test_component.py diff --git a/bundle-workflow/src/test_workflow/test_recorder/__init__.py b/src/test_workflow/test_recorder/__init__.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_recorder/__init__.py rename to src/test_workflow/test_recorder/__init__.py diff --git a/bundle-workflow/src/test_workflow/test_recorder/log_recorder.py b/src/test_workflow/test_recorder/log_recorder.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_recorder/log_recorder.py rename to src/test_workflow/test_recorder/log_recorder.py diff --git a/bundle-workflow/src/test_workflow/test_recorder/test_recorder.py b/src/test_workflow/test_recorder/test_recorder.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_recorder/test_recorder.py rename to src/test_workflow/test_recorder/test_recorder.py diff --git a/bundle-workflow/src/test_workflow/test_recorder/test_result_data.py b/src/test_workflow/test_recorder/test_result_data.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_recorder/test_result_data.py rename to src/test_workflow/test_recorder/test_result_data.py diff --git a/bundle-workflow/src/test_workflow/test_result/__init__.py b/src/test_workflow/test_result/__init__.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_result/__init__.py rename to src/test_workflow/test_result/__init__.py diff --git a/bundle-workflow/src/test_workflow/test_result/test_component_results.py b/src/test_workflow/test_result/test_component_results.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_result/test_component_results.py rename to src/test_workflow/test_result/test_component_results.py diff --git a/bundle-workflow/src/test_workflow/test_result/test_result.py b/src/test_workflow/test_result/test_result.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_result/test_result.py rename to src/test_workflow/test_result/test_result.py diff --git a/bundle-workflow/src/test_workflow/test_result/test_suite_results.py b/src/test_workflow/test_result/test_suite_results.py similarity index 100% rename from bundle-workflow/src/test_workflow/test_result/test_suite_results.py rename to src/test_workflow/test_result/test_suite_results.py diff --git a/bundle-workflow/test.sh b/test.sh similarity index 100% rename from bundle-workflow/test.sh rename to test.sh diff --git a/bundle-workflow/tests/__init__.py b/tests/__init__.py similarity index 100% rename from bundle-workflow/tests/__init__.py rename to tests/__init__.py diff --git a/bundle-workflow/tests/data/opensearch-build-1.1.0.yml b/tests/data/opensearch-build-1.1.0.yml similarity index 100% rename from bundle-workflow/tests/data/opensearch-build-1.1.0.yml rename to tests/data/opensearch-build-1.1.0.yml diff --git a/bundle-workflow/tests/test_aws/__init__.py b/tests/test_aws/__init__.py similarity index 100% rename from bundle-workflow/tests/test_aws/__init__.py rename to tests/test_aws/__init__.py diff --git a/bundle-workflow/tests/test_aws/test_s3_bucket.py b/tests/test_aws/test_s3_bucket.py similarity index 100% rename from bundle-workflow/tests/test_aws/test_s3_bucket.py rename to tests/test_aws/test_s3_bucket.py diff --git a/bundle-workflow/tests/test_run_assemble.py b/tests/test_run_assemble.py similarity index 96% rename from bundle-workflow/tests/test_run_assemble.py rename to tests/test_run_assemble.py index 9c3ffdd862..643f4660a6 100644 --- a/bundle-workflow/tests/test_run_assemble.py +++ b/tests/test_run_assemble.py @@ -52,7 +52,7 @@ def test_main(self, mock_copy, mock_temp, mock_recorder, mock_bundles, *mocks): os.path.realpath( os.path.join( os.path.dirname(os.path.abspath(__file__)), - "../../release/tar/linux/opensearch-tar-install.sh", + "../release/tar/linux/opensearch-tar-install.sh", ) ), "path/opensearch-tar-install.sh", diff --git a/bundle-workflow/tests/test_run_build.py b/tests/test_run_build.py similarity index 97% rename from bundle-workflow/tests/test_run_build.py rename to tests/test_run_build.py index 40ace7661e..017c13efb2 100644 --- a/bundle-workflow/tests/test_run_build.py +++ b/tests/test_run_build.py @@ -29,7 +29,7 @@ def test_usage(self): OPENSEARCH_MANIFEST = os.path.realpath( os.path.join( - os.path.dirname(__file__), "../../manifests/1.1.0/opensearch-1.1.0.yml" + os.path.dirname(__file__), "../manifests/1.1.0/opensearch-1.1.0.yml" ) ) diff --git a/bundle-workflow/tests/test_run_checkout.py b/tests/test_run_checkout.py similarity index 96% rename from bundle-workflow/tests/test_run_checkout.py rename to tests/test_run_checkout.py index 1e16fbd662..fa0f709525 100644 --- a/bundle-workflow/tests/test_run_checkout.py +++ b/tests/test_run_checkout.py @@ -29,7 +29,7 @@ def test_usage(self): OPENSEARCH_MANIFEST = os.path.realpath( os.path.join( - os.path.dirname(__file__), "../../manifests/1.1.0/opensearch-1.1.0.yml" + os.path.dirname(__file__), "../manifests/1.1.0/opensearch-1.1.0.yml" ) ) diff --git a/bundle-workflow/tests/test_run_ci.py b/tests/test_run_ci.py similarity index 95% rename from bundle-workflow/tests/test_run_ci.py rename to tests/test_run_ci.py index 3497108986..20571e5dcb 100644 --- a/bundle-workflow/tests/test_run_ci.py +++ b/tests/test_run_ci.py @@ -29,7 +29,7 @@ def test_usage(self): OPENSEARCH_MANIFEST = os.path.realpath( os.path.join( - os.path.dirname(__file__), "../../manifests/1.1.0/opensearch-1.1.0.yml" + os.path.dirname(__file__), "../manifests/1.1.0/opensearch-1.1.0.yml" ) ) diff --git a/bundle-workflow/tests/test_run_manifests.py b/tests/test_run_manifests.py similarity index 100% rename from bundle-workflow/tests/test_run_manifests.py rename to tests/test_run_manifests.py diff --git a/bundle-workflow/tests/test_run_sign.py b/tests/test_run_sign.py similarity index 100% rename from bundle-workflow/tests/test_run_sign.py rename to tests/test_run_sign.py diff --git a/bundle-workflow/tests/tests_assemble_workflow/__init__.py b/tests/tests_assemble_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/__init__.py rename to tests/tests_assemble_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_assemble_workflow/data/artifacts/bundle/opensearch-dashboards-min-1.1.0-linux-x64.tar.gz b/tests/tests_assemble_workflow/data/artifacts/bundle/opensearch-dashboards-min-1.1.0-linux-x64.tar.gz similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/data/artifacts/bundle/opensearch-dashboards-min-1.1.0-linux-x64.tar.gz rename to tests/tests_assemble_workflow/data/artifacts/bundle/opensearch-dashboards-min-1.1.0-linux-x64.tar.gz diff --git a/bundle-workflow/tests/tests_assemble_workflow/data/artifacts/bundle/opensearch-min-1.1.0-linux-x64.tar.gz b/tests/tests_assemble_workflow/data/artifacts/bundle/opensearch-min-1.1.0-linux-x64.tar.gz similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/data/artifacts/bundle/opensearch-min-1.1.0-linux-x64.tar.gz rename to tests/tests_assemble_workflow/data/artifacts/bundle/opensearch-min-1.1.0-linux-x64.tar.gz diff --git a/bundle-workflow/tests/tests_assemble_workflow/data/invalid/bundle/opensearch-min-1.1.0-linux-x64.tar.gz b/tests/tests_assemble_workflow/data/invalid/bundle/opensearch-min-1.1.0-linux-x64.tar.gz similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/data/invalid/bundle/opensearch-min-1.1.0-linux-x64.tar.gz rename to tests/tests_assemble_workflow/data/invalid/bundle/opensearch-min-1.1.0-linux-x64.tar.gz diff --git a/bundle-workflow/tests/tests_assemble_workflow/data/opensearch-build-1.1.0.yml b/tests/tests_assemble_workflow/data/opensearch-build-1.1.0.yml similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/data/opensearch-build-1.1.0.yml rename to tests/tests_assemble_workflow/data/opensearch-build-1.1.0.yml diff --git a/bundle-workflow/tests/tests_assemble_workflow/data/opensearch-dashboards-build-1.1.0.yml b/tests/tests_assemble_workflow/data/opensearch-dashboards-build-1.1.0.yml similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/data/opensearch-dashboards-build-1.1.0.yml rename to tests/tests_assemble_workflow/data/opensearch-dashboards-build-1.1.0.yml diff --git a/bundle-workflow/tests/tests_assemble_workflow/test_bundle.py b/tests/tests_assemble_workflow/test_bundle.py similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/test_bundle.py rename to tests/tests_assemble_workflow/test_bundle.py diff --git a/bundle-workflow/tests/tests_assemble_workflow/test_bundle_opensearch.py b/tests/tests_assemble_workflow/test_bundle_opensearch.py similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/test_bundle_opensearch.py rename to tests/tests_assemble_workflow/test_bundle_opensearch.py diff --git a/bundle-workflow/tests/tests_assemble_workflow/test_bundle_opensearch_dashboards.py b/tests/tests_assemble_workflow/test_bundle_opensearch_dashboards.py similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/test_bundle_opensearch_dashboards.py rename to tests/tests_assemble_workflow/test_bundle_opensearch_dashboards.py diff --git a/bundle-workflow/tests/tests_assemble_workflow/test_bundle_recorder.py b/tests/tests_assemble_workflow/test_bundle_recorder.py similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/test_bundle_recorder.py rename to tests/tests_assemble_workflow/test_bundle_recorder.py diff --git a/bundle-workflow/tests/tests_assemble_workflow/test_bundles.py b/tests/tests_assemble_workflow/test_bundles.py similarity index 100% rename from bundle-workflow/tests/tests_assemble_workflow/test_bundles.py rename to tests/tests_assemble_workflow/test_bundles.py diff --git a/bundle-workflow/tests/tests_build_workflow/__init__.py b/tests/tests_build_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_build_workflow/__init__.py rename to tests/tests_build_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_build_workflow/opensearch/test_build_artifact_opensearch_check_maven.py b/tests/tests_build_workflow/opensearch/test_build_artifact_opensearch_check_maven.py similarity index 100% rename from bundle-workflow/tests/tests_build_workflow/opensearch/test_build_artifact_opensearch_check_maven.py rename to tests/tests_build_workflow/opensearch/test_build_artifact_opensearch_check_maven.py diff --git a/bundle-workflow/tests/tests_build_workflow/opensearch/test_build_artifact_opensearch_check_plugin.py b/tests/tests_build_workflow/opensearch/test_build_artifact_opensearch_check_plugin.py similarity index 100% rename from bundle-workflow/tests/tests_build_workflow/opensearch/test_build_artifact_opensearch_check_plugin.py rename to tests/tests_build_workflow/opensearch/test_build_artifact_opensearch_check_plugin.py diff --git a/bundle-workflow/tests/tests_build_workflow/opensearch_dashboards/test_build_artifact_opensearch_dashboards_check_plugin.py b/tests/tests_build_workflow/opensearch_dashboards/test_build_artifact_opensearch_dashboards_check_plugin.py similarity index 100% rename from bundle-workflow/tests/tests_build_workflow/opensearch_dashboards/test_build_artifact_opensearch_dashboards_check_plugin.py rename to tests/tests_build_workflow/opensearch_dashboards/test_build_artifact_opensearch_dashboards_check_plugin.py diff --git a/bundle-workflow/tests/tests_build_workflow/test_build_args.py b/tests/tests_build_workflow/test_build_args.py similarity index 97% rename from bundle-workflow/tests/tests_build_workflow/test_build_args.py rename to tests/tests_build_workflow/test_build_args.py index a2ed3596b0..f4a5bed947 100644 --- a/bundle-workflow/tests/tests_build_workflow/test_build_args.py +++ b/tests/tests_build_workflow/test_build_args.py @@ -24,7 +24,7 @@ class TestBuildArgs(unittest.TestCase): OPENSEARCH_MANIFEST = os.path.realpath( os.path.join( - os.path.dirname(__file__), "../../../manifests/1.1.0/opensearch-1.1.0.yml" + os.path.dirname(__file__), "../../manifests/1.1.0/opensearch-1.1.0.yml" ) ) diff --git a/bundle-workflow/tests/tests_build_workflow/test_build_artifact_checks.py b/tests/tests_build_workflow/test_build_artifact_checks.py similarity index 100% rename from bundle-workflow/tests/tests_build_workflow/test_build_artifact_checks.py rename to tests/tests_build_workflow/test_build_artifact_checks.py diff --git a/bundle-workflow/tests/tests_build_workflow/test_build_recorder.py b/tests/tests_build_workflow/test_build_recorder.py similarity index 100% rename from bundle-workflow/tests/tests_build_workflow/test_build_recorder.py rename to tests/tests_build_workflow/test_build_recorder.py diff --git a/bundle-workflow/tests/tests_build_workflow/test_build_target.py b/tests/tests_build_workflow/test_build_target.py similarity index 100% rename from bundle-workflow/tests/tests_build_workflow/test_build_target.py rename to tests/tests_build_workflow/test_build_target.py diff --git a/bundle-workflow/tests/tests_build_workflow/test_builder.py b/tests/tests_build_workflow/test_builder.py similarity index 100% rename from bundle-workflow/tests/tests_build_workflow/test_builder.py rename to tests/tests_build_workflow/test_builder.py diff --git a/bundle-workflow/tests/tests_checkout_workflow/__init__.py b/tests/tests_checkout_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_checkout_workflow/__init__.py rename to tests/tests_checkout_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_checkout_workflow/test_checkout_args.py b/tests/tests_checkout_workflow/test_checkout_args.py similarity index 91% rename from bundle-workflow/tests/tests_checkout_workflow/test_checkout_args.py rename to tests/tests_checkout_workflow/test_checkout_args.py index 1b140135da..838ef32668 100644 --- a/bundle-workflow/tests/tests_checkout_workflow/test_checkout_args.py +++ b/tests/tests_checkout_workflow/test_checkout_args.py @@ -20,7 +20,7 @@ class TestCheckoutArgs(unittest.TestCase): OPENSEARCH_MANIFEST = os.path.realpath( os.path.join( - os.path.dirname(__file__), "../../../manifests/1.1.0/opensearch-1.1.0.yml" + os.path.dirname(__file__), "../../manifests/1.1.0/opensearch-1.1.0.yml" ) ) diff --git a/bundle-workflow/tests/tests_ci_workflow/__init__.py b/tests/tests_ci_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/__init__.py rename to tests/tests_ci_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_ci_workflow/data/job_scheduler_dependencies.txt b/tests/tests_ci_workflow/data/job_scheduler_dependencies.txt similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/data/job_scheduler_dependencies.txt rename to tests/tests_ci_workflow/data/job_scheduler_dependencies.txt diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci.py b/tests/tests_ci_workflow/test_ci.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/test_ci.py rename to tests/tests_ci_workflow/test_ci.py diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci_args.py b/tests/tests_ci_workflow/test_ci_args.py similarity index 96% rename from bundle-workflow/tests/tests_ci_workflow/test_ci_args.py rename to tests/tests_ci_workflow/test_ci_args.py index d13d1371fb..973c84e744 100644 --- a/bundle-workflow/tests/tests_ci_workflow/test_ci_args.py +++ b/tests/tests_ci_workflow/test_ci_args.py @@ -21,7 +21,7 @@ class TestCiArgs(unittest.TestCase): OPENSEARCH_MANIFEST = os.path.realpath( os.path.join( - os.path.dirname(__file__), "../../../manifests/1.1.0/opensearch-1.1.0.yml" + os.path.dirname(__file__), "../../manifests/1.1.0/opensearch-1.1.0.yml" ) ) diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci_check.py b/tests/tests_ci_workflow/test_ci_check.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/test_ci_check.py rename to tests/tests_ci_workflow/test_ci_check.py diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_dependencies.py b/tests/tests_ci_workflow/test_ci_check_gradle_dependencies.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_dependencies.py rename to tests/tests_ci_workflow/test_ci_check_gradle_dependencies.py diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_dependencies_opensearch.py b/tests/tests_ci_workflow/test_ci_check_gradle_dependencies_opensearch.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_dependencies_opensearch.py rename to tests/tests_ci_workflow/test_ci_check_gradle_dependencies_opensearch.py diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_properties.py b/tests/tests_ci_workflow/test_ci_check_gradle_properties.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_properties.py rename to tests/tests_ci_workflow/test_ci_check_gradle_properties.py diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_properties_version.py b/tests/tests_ci_workflow/test_ci_check_gradle_properties_version.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_properties_version.py rename to tests/tests_ci_workflow/test_ci_check_gradle_properties_version.py diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_publish_to_maven_local.py b/tests/tests_ci_workflow/test_ci_check_gradle_publish_to_maven_local.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/test_ci_check_gradle_publish_to_maven_local.py rename to tests/tests_ci_workflow/test_ci_check_gradle_publish_to_maven_local.py diff --git a/bundle-workflow/tests/tests_ci_workflow/test_ci_target.py b/tests/tests_ci_workflow/test_ci_target.py similarity index 100% rename from bundle-workflow/tests/tests_ci_workflow/test_ci_target.py rename to tests/tests_ci_workflow/test_ci_target.py diff --git a/bundle-workflow/tests/tests_git/__init__.py b/tests/tests_git/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_git/__init__.py rename to tests/tests_git/__init__.py diff --git a/bundle-workflow/tests/tests_git/test_git_repository.py b/tests/tests_git/test_git_repository.py similarity index 100% rename from bundle-workflow/tests/tests_git/test_git_repository.py rename to tests/tests_git/test_git_repository.py diff --git a/bundle-workflow/tests/tests_manifests/__init__.py b/tests/tests_manifests/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_manifests/__init__.py rename to tests/tests_manifests/__init__.py diff --git a/bundle-workflow/tests/tests_manifests/data/invalid-ref.yml b/tests/tests_manifests/data/invalid-ref.yml similarity index 100% rename from bundle-workflow/tests/tests_manifests/data/invalid-ref.yml rename to tests/tests_manifests/data/invalid-ref.yml diff --git a/bundle-workflow/tests/tests_manifests/data/invalid-schema-version.yml b/tests/tests_manifests/data/invalid-schema-version.yml similarity index 100% rename from bundle-workflow/tests/tests_manifests/data/invalid-schema-version.yml rename to tests/tests_manifests/data/invalid-schema-version.yml diff --git a/bundle-workflow/tests/tests_manifests/data/min.yml b/tests/tests_manifests/data/min.yml similarity index 100% rename from bundle-workflow/tests/tests_manifests/data/min.yml rename to tests/tests_manifests/data/min.yml diff --git a/bundle-workflow/tests/tests_manifests/data/opensearch-build-1.1.0.yml b/tests/tests_manifests/data/opensearch-build-1.1.0.yml similarity index 100% rename from bundle-workflow/tests/tests_manifests/data/opensearch-build-1.1.0.yml rename to tests/tests_manifests/data/opensearch-build-1.1.0.yml diff --git a/bundle-workflow/tests/tests_manifests/data/opensearch-build-1.2.0.yml b/tests/tests_manifests/data/opensearch-build-1.2.0.yml similarity index 100% rename from bundle-workflow/tests/tests_manifests/data/opensearch-build-1.2.0.yml rename to tests/tests_manifests/data/opensearch-build-1.2.0.yml diff --git a/bundle-workflow/tests/tests_manifests/data/opensearch-bundle-1.1.0.yml b/tests/tests_manifests/data/opensearch-bundle-1.1.0.yml similarity index 100% rename from bundle-workflow/tests/tests_manifests/data/opensearch-bundle-1.1.0.yml rename to tests/tests_manifests/data/opensearch-bundle-1.1.0.yml diff --git a/bundle-workflow/tests/tests_manifests/data/opensearch-test-1.1.0.yml b/tests/tests_manifests/data/opensearch-test-1.1.0.yml similarity index 100% rename from bundle-workflow/tests/tests_manifests/data/opensearch-test-1.1.0.yml rename to tests/tests_manifests/data/opensearch-test-1.1.0.yml diff --git a/bundle-workflow/tests/tests_manifests/test_build_manifest.py b/tests/tests_manifests/test_build_manifest.py similarity index 100% rename from bundle-workflow/tests/tests_manifests/test_build_manifest.py rename to tests/tests_manifests/test_build_manifest.py diff --git a/bundle-workflow/tests/tests_manifests/test_bundle_manifest.py b/tests/tests_manifests/test_bundle_manifest.py similarity index 100% rename from bundle-workflow/tests/tests_manifests/test_bundle_manifest.py rename to tests/tests_manifests/test_bundle_manifest.py diff --git a/bundle-workflow/tests/tests_manifests/test_input_manifest.py b/tests/tests_manifests/test_input_manifest.py similarity index 97% rename from bundle-workflow/tests/tests_manifests/test_input_manifest.py rename to tests/tests_manifests/test_input_manifest.py index cb4d4395e9..47e0908e36 100644 --- a/bundle-workflow/tests/tests_manifests/test_input_manifest.py +++ b/tests/tests_manifests/test_input_manifest.py @@ -16,7 +16,7 @@ class TestInputManifest(unittest.TestCase): def setUp(self): self.maxDiff = None self.manifests_path = os.path.realpath( - os.path.join(os.path.dirname(__file__), "../../../manifests") + os.path.join(os.path.dirname(__file__), "../../manifests") ) def test_1_0(self): diff --git a/bundle-workflow/tests/tests_manifests/test_input_manifests.py b/tests/tests_manifests/test_input_manifests.py similarity index 100% rename from bundle-workflow/tests/tests_manifests/test_input_manifests.py rename to tests/tests_manifests/test_input_manifests.py diff --git a/bundle-workflow/tests/tests_manifests/test_manifest.py b/tests/tests_manifests/test_manifest.py similarity index 100% rename from bundle-workflow/tests/tests_manifests/test_manifest.py rename to tests/tests_manifests/test_manifest.py diff --git a/bundle-workflow/tests/tests_manifests/test_manifests.py b/tests/tests_manifests/test_manifests.py similarity index 100% rename from bundle-workflow/tests/tests_manifests/test_manifests.py rename to tests/tests_manifests/test_manifests.py diff --git a/bundle-workflow/tests/tests_manifests/test_test_manifest.py b/tests/tests_manifests/test_test_manifest.py similarity index 100% rename from bundle-workflow/tests/tests_manifests/test_test_manifest.py rename to tests/tests_manifests/test_test_manifest.py diff --git a/bundle-workflow/tests/tests_manifests_workflow/__init__.py b/tests/tests_manifests_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_manifests_workflow/__init__.py rename to tests/tests_manifests_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_manifests_workflow/test_component.py b/tests/tests_manifests_workflow/test_component.py similarity index 100% rename from bundle-workflow/tests/tests_manifests_workflow/test_component.py rename to tests/tests_manifests_workflow/test_component.py diff --git a/bundle-workflow/tests/tests_manifests_workflow/test_component_opensearch.py b/tests/tests_manifests_workflow/test_component_opensearch.py similarity index 100% rename from bundle-workflow/tests/tests_manifests_workflow/test_component_opensearch.py rename to tests/tests_manifests_workflow/test_component_opensearch.py diff --git a/bundle-workflow/tests/tests_manifests_workflow/test_component_opensearch_min.py b/tests/tests_manifests_workflow/test_component_opensearch_min.py similarity index 100% rename from bundle-workflow/tests/tests_manifests_workflow/test_component_opensearch_min.py rename to tests/tests_manifests_workflow/test_component_opensearch_min.py diff --git a/bundle-workflow/tests/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py similarity index 93% rename from bundle-workflow/tests/tests_manifests_workflow/test_input_manifests.py rename to tests/tests_manifests_workflow/test_input_manifests.py index 07c65ecd64..135cf89db4 100644 --- a/bundle-workflow/tests/tests_manifests_workflow/test_input_manifests.py +++ b/tests/tests_manifests_workflow/test_input_manifests.py @@ -18,14 +18,14 @@ def test_files(self): self.assertTrue(len(files) >= 2) manifest = os.path.realpath( os.path.join( - os.path.dirname(__file__), "../../../manifests/1.1.0/opensearch-1.1.0.yml" + os.path.dirname(__file__), "../../manifests/1.1.0/opensearch-1.1.0.yml" ) ) self.assertTrue(manifest in files) def test_manifests_path(self): path = os.path.realpath( - os.path.join(os.path.dirname(__file__), "../../../manifests/") + os.path.join(os.path.dirname(__file__), "../../manifests/") ) self.assertEqual(path, InputManifests.manifests_path()) diff --git a/bundle-workflow/tests/tests_manifests_workflow/test_manifests_args.py b/tests/tests_manifests_workflow/test_manifests_args.py similarity index 100% rename from bundle-workflow/tests/tests_manifests_workflow/test_manifests_args.py rename to tests/tests_manifests_workflow/test_manifests_args.py diff --git a/bundle-workflow/tests/tests_paths/__init__.py b/tests/tests_paths/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_paths/__init__.py rename to tests/tests_paths/__init__.py diff --git a/bundle-workflow/tests/tests_paths/data/git/component-with-scripts-folder/scripts/build.sh b/tests/tests_paths/data/git/component-with-scripts-folder/scripts/build.sh similarity index 100% rename from bundle-workflow/tests/tests_paths/data/git/component-with-scripts-folder/scripts/build.sh rename to tests/tests_paths/data/git/component-with-scripts-folder/scripts/build.sh diff --git a/bundle-workflow/tests/tests_paths/data/git/component-with-scripts-folder/scripts/install.sh b/tests/tests_paths/data/git/component-with-scripts-folder/scripts/install.sh similarity index 100% rename from bundle-workflow/tests/tests_paths/data/git/component-with-scripts-folder/scripts/install.sh rename to tests/tests_paths/data/git/component-with-scripts-folder/scripts/install.sh diff --git a/bundle-workflow/tests/tests_paths/data/git/component-with-scripts-folder/scripts/integtest.sh b/tests/tests_paths/data/git/component-with-scripts-folder/scripts/integtest.sh similarity index 100% rename from bundle-workflow/tests/tests_paths/data/git/component-with-scripts-folder/scripts/integtest.sh rename to tests/tests_paths/data/git/component-with-scripts-folder/scripts/integtest.sh diff --git a/bundle-workflow/tests/tests_paths/data/git/component-with-scripts/build.sh b/tests/tests_paths/data/git/component-with-scripts/build.sh similarity index 100% rename from bundle-workflow/tests/tests_paths/data/git/component-with-scripts/build.sh rename to tests/tests_paths/data/git/component-with-scripts/build.sh diff --git a/bundle-workflow/tests/tests_paths/data/git/component-with-scripts/install.sh b/tests/tests_paths/data/git/component-with-scripts/install.sh similarity index 100% rename from bundle-workflow/tests/tests_paths/data/git/component-with-scripts/install.sh rename to tests/tests_paths/data/git/component-with-scripts/install.sh diff --git a/bundle-workflow/tests/tests_paths/data/git/component-with-scripts/integtest.sh b/tests/tests_paths/data/git/component-with-scripts/integtest.sh similarity index 100% rename from bundle-workflow/tests/tests_paths/data/git/component-with-scripts/integtest.sh rename to tests/tests_paths/data/git/component-with-scripts/integtest.sh diff --git a/bundle-workflow/tests/tests_paths/data/git/component-without-scripts/.gitkeep b/tests/tests_paths/data/git/component-without-scripts/.gitkeep similarity index 100% rename from bundle-workflow/tests/tests_paths/data/git/component-without-scripts/.gitkeep rename to tests/tests_paths/data/git/component-without-scripts/.gitkeep diff --git a/bundle-workflow/tests/tests_paths/test_script_finder.py b/tests/tests_paths/test_script_finder.py similarity index 100% rename from bundle-workflow/tests/tests_paths/test_script_finder.py rename to tests/tests_paths/test_script_finder.py diff --git a/bundle-workflow/tests/tests_paths/test_tree_walker.py b/tests/tests_paths/test_tree_walker.py similarity index 100% rename from bundle-workflow/tests/tests_paths/test_tree_walker.py rename to tests/tests_paths/test_tree_walker.py diff --git a/bundle-workflow/tests/tests_sign_workflow/__init__.py b/tests/tests_sign_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_sign_workflow/__init__.py rename to tests/tests_sign_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_sign_workflow/test_signer.py b/tests/tests_sign_workflow/test_signer.py similarity index 100% rename from bundle-workflow/tests/tests_sign_workflow/test_signer.py rename to tests/tests_sign_workflow/test_signer.py diff --git a/bundle-workflow/tests/tests_system/__init__.py b/tests/tests_system/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_system/__init__.py rename to tests/tests_system/__init__.py diff --git a/bundle-workflow/tests/tests_system/test_arch.py b/tests/tests_system/test_arch.py similarity index 100% rename from bundle-workflow/tests/tests_system/test_arch.py rename to tests/tests_system/test_arch.py diff --git a/bundle-workflow/tests/tests_system/test_config_file.py b/tests/tests_system/test_config_file.py similarity index 100% rename from bundle-workflow/tests/tests_system/test_config_file.py rename to tests/tests_system/test_config_file.py diff --git a/bundle-workflow/tests/tests_system/test_execute.py b/tests/tests_system/test_execute.py similarity index 100% rename from bundle-workflow/tests/tests_system/test_execute.py rename to tests/tests_system/test_execute.py diff --git a/bundle-workflow/tests/tests_system/test_properties_file.py b/tests/tests_system/test_properties_file.py similarity index 100% rename from bundle-workflow/tests/tests_system/test_properties_file.py rename to tests/tests_system/test_properties_file.py diff --git a/bundle-workflow/tests/tests_system/test_temporary_directory.py b/tests/tests_system/test_temporary_directory.py similarity index 100% rename from bundle-workflow/tests/tests_system/test_temporary_directory.py rename to tests/tests_system/test_temporary_directory.py diff --git a/bundle-workflow/tests/tests_test_workflow/__init__.py b/tests/tests_test_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/__init__.py rename to tests/tests_test_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_bwc_workflow/__init__.py b/tests/tests_test_workflow/test_bwc_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_bwc_workflow/__init__.py rename to tests/tests_test_workflow/test_bwc_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_bwc_workflow/bwc_test/data/test_manifest.yaml b/tests/tests_test_workflow/test_bwc_workflow/bwc_test/data/test_manifest.yaml similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_bwc_workflow/bwc_test/data/test_manifest.yaml rename to tests/tests_test_workflow/test_bwc_workflow/bwc_test/data/test_manifest.yaml diff --git a/bundle-workflow/tests/tests_test_workflow/test_bwc_workflow/bwc_test/test_bwc_suite.py b/tests/tests_test_workflow/test_bwc_workflow/bwc_test/test_bwc_suite.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_bwc_workflow/bwc_test/test_bwc_suite.py rename to tests/tests_test_workflow/test_bwc_workflow/bwc_test/test_bwc_suite.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_dependency_installer.py b/tests/tests_test_workflow/test_dependency_installer.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_dependency_installer.py rename to tests/tests_test_workflow/test_dependency_installer.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_integ_workflow/__init__.py b/tests/tests_test_workflow/test_integ_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_integ_workflow/__init__.py rename to tests/tests_test_workflow/test_integ_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/__init__.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/__init__.py rename to tests/tests_test_workflow/test_integ_workflow/integ_test/__init__.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest.yml b/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest.yml similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest.yml rename to tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest.yml diff --git a/bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_missing_components.yml b/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_missing_components.yml similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_missing_components.yml rename to tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_missing_components.yml diff --git a/bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/data/bundle_manifest.yml b/tests/tests_test_workflow/test_integ_workflow/integ_test/data/bundle_manifest.yml similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/data/bundle_manifest.yml rename to tests/tests_test_workflow/test_integ_workflow/integ_test/data/bundle_manifest.yml diff --git a/bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/data/test_manifest.yml b/tests/tests_test_workflow/test_integ_workflow/integ_test/data/test_manifest.yml similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/data/test_manifest.yml rename to tests/tests_test_workflow/test_integ_workflow/integ_test/data/test_manifest.yml diff --git a/bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/test_integ_test_suite.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_integ_test_suite.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/test_integ_test_suite.py rename to tests/tests_test_workflow/test_integ_workflow/integ_test/test_integ_test_suite.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/test_local_test_cluster.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_local_test_cluster.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_integ_workflow/integ_test/test_local_test_cluster.py rename to tests/tests_test_workflow/test_integ_workflow/integ_test/test_local_test_cluster.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_perf_workflow/__init__.py b/tests/tests_test_workflow/test_perf_workflow/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_perf_workflow/__init__.py rename to tests/tests_test_workflow/test_perf_workflow/__init__.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_perf_workflow/perf_test/__init__.py b/tests/tests_test_workflow/test_perf_workflow/perf_test/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_perf_workflow/perf_test/__init__.py rename to tests/tests_test_workflow/test_perf_workflow/perf_test/__init__.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_perf_workflow/perf_test/data/bundle_manifest.yaml b/tests/tests_test_workflow/test_perf_workflow/perf_test/data/bundle_manifest.yaml similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_perf_workflow/perf_test/data/bundle_manifest.yaml rename to tests/tests_test_workflow/test_perf_workflow/perf_test/data/bundle_manifest.yaml diff --git a/bundle-workflow/tests/tests_test_workflow/test_perf_workflow/perf_test/test_perf_test_cluster.py b/tests/tests_test_workflow/test_perf_workflow/perf_test/test_perf_test_cluster.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_perf_workflow/perf_test/test_perf_test_cluster.py rename to tests/tests_test_workflow/test_perf_workflow/perf_test/test_perf_test_cluster.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_perf_workflow/perf_test/test_perf_test_suite.py b/tests/tests_test_workflow/test_perf_workflow/perf_test/test_perf_test_suite.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_perf_workflow/perf_test/test_perf_test_suite.py rename to tests/tests_test_workflow/test_perf_workflow/perf_test/test_perf_test_suite.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_test_args.py b/tests/tests_test_workflow/test_test_args.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_test_args.py rename to tests/tests_test_workflow/test_test_args.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_test_component.py b/tests/tests_test_workflow/test_test_component.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_test_component.py rename to tests/tests_test_workflow/test_test_component.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_test_result/__init__.py b/tests/tests_test_workflow/test_test_result/__init__.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_test_result/__init__.py rename to tests/tests_test_workflow/test_test_result/__init__.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_test_result/test_test_component_results.py b/tests/tests_test_workflow/test_test_result/test_test_component_results.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_test_result/test_test_component_results.py rename to tests/tests_test_workflow/test_test_result/test_test_component_results.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_test_result/test_test_result.py b/tests/tests_test_workflow/test_test_result/test_test_result.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_test_result/test_test_result.py rename to tests/tests_test_workflow/test_test_result/test_test_result.py diff --git a/bundle-workflow/tests/tests_test_workflow/test_test_result/test_test_suite_results.py b/tests/tests_test_workflow/test_test_result/test_test_suite_results.py similarity index 100% rename from bundle-workflow/tests/tests_test_workflow/test_test_result/test_test_suite_results.py rename to tests/tests_test_workflow/test_test_result/test_test_suite_results.py