[Custom Agent Deployer Fix] Fix to look for Dockerfile in integrations repo for custom agent deployer #1009

agithomas · 2022-10-18T10:10:41Z

Tested with below configuration


version: '2.3'
services:
  docker-custom-agent:
    #build: https://raw.githubusercontent.com/agithomas/integrations/issue-4405/packages/oracle/data_stream/memory/_dev/deploy/agent/Dockerfile
    build:
      context: .
      dockerfile: Dockerfile
    image: elastic-agent-oracle-client
    # volumes:
    #   - ${SERVICE_LOGS_DIR}:/opt/oracle/oradata
    healthcheck:
      test: ["CMD", "bash", "-c", "echo 'select 1 from dual;' | ORACLE_HOME=/opt/oracle/instantclient_21_4 /opt/oracle/instantclient_21_4/sqlplus -s sys/Oradoc_db1@oracle:1521/ORCLCDB.localdomain?sysdba=1"]
      interval: 10s
      timeout: 10s
      retries: 60
    user: root
  oracle:
    image: docker.elastic.co/observability-ci/database-enterprise:12.2.0.1
    ports:
      - 1521:1521
      - 5500:5500

Fixes #997

…instead of elastic-package repo

agithomas · 2022-10-18T10:11:15Z

t-base.yml -p elastic-package-service down --volumes
Stopping elastic-package-service_docker-custom-agent_1 ... done
Stopping elastic-package-service_oracle_1              ... done
WARNING: Found orphan containers (elastic-package-service_oracle-database-audit-logfile_1) for this project. If you removed or renamed this service in your compose file, you can run this command with the --remove-orphans flag to clean it up.
Removing elastic-package-service_docker-custom-agent_1 ... done
Removing elastic-package-service_oracle_1              ... done
Removing network elastic-package-service_default
2022/10/18 09:58:40 DEBUG deleting data in data stream...
--- Test results for package: oracle - START ---
╭─────────┬─────────────┬───────────┬───────────┬────────┬─────────────────╮
│ PACKAGE │ DATA STREAM │ TEST TYPE │ TEST NAME │ RESULT │    TIME ELAPSED │
├─────────┼─────────────┼───────────┼───────────┼────────┼─────────────────┤
│ oracle  │ memory      │ system    │ memory    │ PASS   │ 3m25.531497298s │
╰─────────┴─────────────┴───────────┴───────────┴────────┴─────────────────╯
--- Test results for package: oracle - END   ---
Done

elasticmachine · 2022-10-18T10:15:06Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-11-02T10:18:58.088+0000
Duration: 31 min 58 sec

Test stats 🧪

Test	Results
Failed	0
Passed	863
Skipped	0
Total	863

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.

jsoriano

👍 Looks good, could you please add a test package and update the docs in docs/howto/system_testing.md?

internal/testrunner/runners/system/servicedeployer/custom_agent.go

elasticmachine · 2022-10-18T11:05:04Z

🌐 Coverage report

Name	Metrics % (`covered/total`)	Diff
Packages	100.0% (`35/35`)	💚
Files	66.667% (`86/129`)	👍
Classes	61.413% (`113/184`)	👍
Methods	47.662% (`367/770`)	👍 0.143
Lines	30.723% (`3288/10702`)	👍
Conditionals	100.0% (`0/0`)	💚

agithomas · 2022-10-18T11:36:07Z

Ran the below command:

PACKAGE_TEST_TYPE=custom-agent-multiservice ./scripts/test-check-packages.sh

Received Output as below.


2022/10/18 11:24:52 DEBUG running command: /usr/local/bin/docker-compose -f /home/agikthomas/.elastic-package/profiles/default/stack/snapshot.yml -p elastic-package-stack down --volumes --remove-orphans
Stopping elastic-package-stack_elastic-agent_1    ... done
Stopping elastic-package-stack_fleet-server_1     ... done
Stopping elastic-package-stack_kibana_1           ... done
Stopping elastic-package-stack_elasticsearch_1    ... done
Stopping elastic-package-stack_package-registry_1 ... done
Removing elastic-package-stack_elastic-agent_is_ready_1    ... done
Removing elastic-package-stack_elastic-agent_1             ... done
Removing elastic-package-stack_fleet-server_is_ready_1     ... done
Removing elastic-package-stack_fleet-server_1              ... done
Removing elastic-package-stack_kibana_is_ready_1           ... done
Removing elastic-package-stack_kibana_1                    ... done
Removing elastic-package-stack_elasticsearch_is_ready_1    ... done
Removing elastic-package-stack_package-registry_is_ready_1 ... done
Removing elastic-package-stack_elasticsearch_1             ... done
Removing elastic-package-stack_package-registry_1          ... done
Removing network elastic-package-stack_default
Done
+ for d in test/packages/${PACKAGE_TEST_TYPE:-other}/${PACKAGE_UNDER_TEST:-*}/
+ cd test/packages/custom-agent-multiservice/oracle/
+ elastic-package clean -v
2022/10/18 11:25:03 DEBUG Enable verbose logging
2022/10/18 11:25:03 DEBUG Distribution built without a version tag, can't determine release chronology. Please consider using official releases at https://github.com/elastic/elastic-package/releases
Clean used resources
2022/10/18 11:25:03 DEBUG Clean build resources
2022/10/18 11:25:03 DEBUG Build directory for integration: /home/agikthomas/go/src/github.com/elastic/elastic-package/build/packages/oracle
2022/10/18 11:25:03 DEBUG Remove directory (path: /home/agikthomas/go/src/github.com/elastic/elastic-package/build/packages/oracle)
2022/10/18 11:25:03 DEBUG Remove zipped built package (path: /home/agikthomas/go/src/github.com/elastic/elastic-package/build/packages/oracle-999.999.999.zip)
Build resources removed: /home/agikthomas/go/src/github.com/elastic/elastic-package/build/packages/oracle
2022/10/18 11:25:03 DEBUG Clean built packages from the development stack
2022/10/18 11:25:03 DEBUG Stack package is not part of the development stack (missing path: /home/agikthomas/.elastic-package/stack/development/oracle)
2022/10/18 11:25:03 DEBUG Clean all service logs
2022/10/18 11:25:03 DEBUG Remove folder content (path: /home/agikthomas/.elastic-package/tmp/service_logs)
Temporary service logs removed: /home/agikthomas/.elastic-package/tmp/service_logs
Done
+ exit 1

The pipeline will break because of the errors


Error: checking package failed: linting package failed: found 2 validation errors:
   1. item [Dockerfile] is not allowed in folder [/home/agikthomas/go/src/github.com/elastic/elastic-package/test/packages/custom-agent-multiservice/oracle/data_stream/memory/_dev/deploy/agent]
   2. file "/home/agikthomas/go/src/github.com/elastic/elastic-package/test/packages/custom-agent-multiservice/oracle/data_stream/memory/_dev/deploy/agent/custom-agent.yml" is invalid: field services: Additional property oracle is not allowed

To fix these errors, below mentioned PRs must be merged with main

elastic/package-spec#436

jsoriano · 2022-10-18T13:03:24Z

To fix these errors, below mentioned PRs must be merged with main

elastic/package-spec#436

Ok, let's wait to merge this one first. Thanks for adding tests files!

agithomas · 2022-10-19T06:25:41Z

It appears that elastic-package must use the latest package-spec to avoid the below mentioned error


[2022-10-19T06:16:59.414Z] Error: checking package failed: linting package failed: found 2 validation errors:

[2022-10-19T06:16:59.414Z]    1. item [Dockerfile] is not allowed in folder [/var/lib/jenkins/workspace/PR-1009-4-43d0ae6c-730f-4db1-8e00-66e0b7e3f21c/src/github.com/elastic/elastic-package/test/packages/custom-agent-multiservice/oracle/data_stream/memory/_dev/deploy/agent]

[2022-10-19T06:16:59.414Z]    2. file "/var/lib/jenkins/workspace/PR-1009-4-43d0ae6c-730f-4db1-8e00-66e0b7e3f21c/src/github.com/elastic/elastic-package/test/packages/custom-agent-multiservice/oracle/data_stream/memory/_dev/deploy/agent/custom-agent.yml" is invalid: field services: Additional property oracle is not allowed

[2022-10-19T06:16:59.414Z] 

[2022-10-19T06:16:59.414Z] + cleanup

[2022-10-19T06:16:59.414Z] + r=1

@jsoriano , is this something that you can help me with ?

jsoriano · 2022-10-19T12:54:31Z

Hey @agithomas, yes, we need to publish a new version of package-spec and include it here.

Something you can try in the meantime is to use the current main version of the package spec, with:

go mod edit -replace github.com/elastic/package-spec=github.com/elastic/package-spec@main

agithomas · 2022-10-25T07:35:36Z

/test

jsoriano · 2022-10-25T11:49:39Z

@agithomas thanks for giving a try to this PR with package-spec main branch. If build goes green I will release a new version of the spec so you can continue with this.

...kages/custom-agent-multiservice/oracle/data_stream/memory/_dev/deploy/agent/custom-agent.yml

.ci/Jenkinsfile

…parse port mapping

mrodm

Minor comment about the location of the test packages.

Could you update docs/howto/system_testing.md to include this scenario under the section "Agent service deployer". It would be helpful for future references.

As @jsoriano mentioned here #1009 (comment), as the latest Jenkins build was successful, I will proceed to release a new package-spec version (v2.1.0).

Once this release is done and updated in elastic-package, you could update your branch with main branch and remove the replace in go.mod file too.

.ci/Jenkinsfile

mrodm · 2022-10-28T07:46:18Z

/test

agithomas · 2022-10-28T08:42:45Z

@mrodm , @jsoriano , There exists a problem in elastic-package related to the cleanup of docker-custom-agent due to which the problem appears and the pipeline breaks .

This issue is re-created while manual doing run as well

The second run of the test fails.

I have identified a fix and i am adding to this PR change to check if it works.

It worked perfectly in local environment testing.

mrodm · 2022-10-28T09:58:43Z

@agithomas package-spec 2.1.0 has been merged in elastic-package #1022.
You can update your branch and remove the usage of main version of package-spec from go.mod and go.sum files (f01b0ae)

mrodm · 2022-10-28T10:37:38Z

@mrodm , @jsoriano , There exists a problem in elastic-package related to the cleanup of docker-custom-agent due to which the problem appears and the pipeline breaks .

This issue is re-created while manual doing run as well

The second run of the test fails.

I have identified a fix and i am adding to this PR change to check if it works.

It worked perfectly in local environment testing.

One option to not block this PR for this fix could be (as the feature has already been tested):

Move again the test package to its own target (as you had previously)
- that would mean that Jenkins jobs finishes successfully 🤞 , and we could merge it
Create another PR with the fix that you have been testing
- in this new PR, the test package should be moved again to with-custom-agent folder
- there is an issue created for this bug elastic-package fails if there is more than one scenario in with-custom-agent #1023

WDYT ?

…iff integration testing

agithomas · 2022-10-28T13:16:06Z

@mrodm , @jsoriano , There exists a problem in elastic-package related to the cleanup of docker-custom-agent due to which the problem appears and the pipeline breaks .
This issue is re-created while manual doing run as well
The second run of the test fails.
I have identified a fix and i am adding to this PR change to check if it works.
It worked perfectly in local environment testing.

One option to not block this PR for this fix could be (as the feature has already been tested):

Move again the test package to its own target (as you had previously)

that would mean that Jenkins jobs finishes successfully 🤞 , and we could merge it

Create another PR with the fix that you have been testing

in this new PR, the test package should be moved again to with-custom-agent folder

there is an issue created for this bug elastic-package fails if there is more than one scenario in with-custom-agent #1023

WDYT ?

Did the rollback as per the above suggestion.

Will create a separate PR for the issue-fix related to policy

docs/howto/system_testing.md

mrodm

Thanks for addressing all the comments!

Custom Agent Deployer: Change path of Dockerfile to integration repo …

b96d49f

…instead of elastic-package repo

agithomas self-assigned this Oct 18, 2022

jsoriano reviewed Oct 18, 2022

View reviewed changes

internal/testrunner/runners/system/servicedeployer/custom_agent.go Outdated Show resolved Hide resolved

jsoriano reviewed Oct 18, 2022

View reviewed changes

internal/testrunner/runners/system/servicedeployer/custom_agent.go Outdated Show resolved Hide resolved

Added the changes

157d811

Added test files

341f567

jsoriano mentioned this pull request Oct 18, 2022

[Custom-agent deployer] Remove validation allowing only one service elastic/package-spec#436

Merged

2 tasks

Removed unwanted files. Made changes to ci pipeline for integration

23d582b

jsoriano mentioned this pull request Oct 19, 2022

Allow to run system tests with custom elastic-agent and a service #997

Closed

package-spec to use main branch instead of v2.0.0

f01b0ae

Fixed connectivity configs

e315bdf

agithomas marked this pull request as draft October 25, 2022 11:40

Fixed package-spec

9a09bd1

mrodm reviewed Oct 25, 2022

View reviewed changes

...kages/custom-agent-multiservice/oracle/data_stream/memory/_dev/deploy/agent/custom-agent.yml Outdated Show resolved Hide resolved

jsoriano reviewed Oct 25, 2022

View reviewed changes

.ci/Jenkinsfile Show resolved Hide resolved

jsoriano mentioned this pull request Oct 26, 2022

Prepare release 2.1.0 elastic/package-spec#440

Merged

agithomas added 3 commits October 27, 2022 08:49

Modified connectivity parameters, added dependencies

c0f7146

Fix to resolve : Docker Compose configuration for service: could not …

f28c050

…parse port mapping

Removed unnecessaary files

d52644c

agithomas marked this pull request as ready for review October 27, 2022 10:46

mrodm reviewed Oct 27, 2022

View reviewed changes

.ci/Jenkinsfile Show resolved Hide resolved

Optimised the test run

69038d4

agithomas added 2 commits October 28, 2022 08:43

Fix for the docker-custom-agent cleanup issue

257cd00

Added fix

c42db58

mrodm mentioned this pull request Oct 28, 2022

elastic-package fails if there is more than one scenario in with-custom-agent #1023

Closed

Changed package-spec to point to v2.0.1. Moved back the packages to d…

54e021a

…iff integration testing

Added custom-agent with multiservices documentation

af2fe6b

mrodm reviewed Nov 2, 2022

View reviewed changes

docs/howto/system_testing.md Outdated Show resolved Hide resolved

Fixed typo issues

41e45a4

mrodm approved these changes Nov 2, 2022

View reviewed changes

agithomas merged commit 315df8e into elastic:main Nov 2, 2022

[Custom Agent Deployer Fix] Fix to look for Dockerfile in integrations repo for custom agent deployer #1009

[Custom Agent Deployer Fix] Fix to look for Dockerfile in integrations repo for custom agent deployer #1009

Uh oh!

Conversation

agithomas commented Oct 18, 2022 • edited by jsoriano Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agithomas commented Oct 18, 2022

Uh oh!

elasticmachine commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

Test stats 🧪

🤖 GitHub comments

Uh oh!

jsoriano left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

elasticmachine commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🌐 Coverage report

Uh oh!

agithomas commented Oct 18, 2022

Uh oh!

jsoriano commented Oct 18, 2022

Uh oh!

agithomas commented Oct 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jsoriano commented Oct 19, 2022

Uh oh!

agithomas commented Oct 25, 2022

Uh oh!

jsoriano commented Oct 25, 2022

Uh oh!

Uh oh!

Uh oh!

mrodm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mrodm commented Oct 28, 2022

Uh oh!

agithomas commented Oct 28, 2022

Uh oh!

mrodm commented Oct 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mrodm commented Oct 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

agithomas commented Oct 28, 2022

Uh oh!

Uh oh!

mrodm left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

agithomas commented Oct 18, 2022 •

edited by jsoriano

Loading

elasticmachine commented Oct 18, 2022 •

edited

Loading

elasticmachine commented Oct 18, 2022 •

edited

Loading

agithomas commented Oct 19, 2022 •

edited

Loading

mrodm commented Oct 28, 2022 •

edited

Loading

mrodm commented Oct 28, 2022 •

edited

Loading