Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not modify a custom agent build name provided by the user when running the e2e environments #16052

Merged

Conversation

FlorentClarret
Copy link
Member

@FlorentClarret FlorentClarret commented Oct 19, 2023

What does this PR do?

Do not modify a custom agent build name provided by the user when running the e2e environments if it's not coming from our repository.

Motivation

I'm trying to run the e2e tests with a custom image I have locally:

╰─ DDEV_E2E_DOCKER_NO_PULL='1' ddev env start -a 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent/agent:v21934574-987b4f2b-7-arm64 http_check py3.11                                                                                                                                                                                                 ─╯

I end up with this error:

Unable to start the Agent: Unable to start Agent container `dd_http_check_py3.11`: Unable to find image '486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent/agent:v21934574-987b4f2b-7-arm64-py3' locally

As you can see, a suffix is applied. I'd like ddev to stop modifying the image name if it's provided by the user and is not from our repo.

Additional Notes

This is not ideal, I know but I do not have a better option for now. Let me know what you think!

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Changelog entries must be created for modifications to shipped code
  • Add the qa/skip-qa label if the PR doesn't need to be tested during QA.

@ghost ghost added the ddev label Oct 19, 2023
@FlorentClarret FlorentClarret force-pushed the florentclarret/ddev/env_start_agent_build_override branch from 29918de to a84b35a Compare October 19, 2023 07:37
@ghost ghost added the documentation label Oct 19, 2023
@FlorentClarret FlorentClarret changed the title Do not modify the agent build tag when provided by the user Do not modify the agent build name if provided by the user when running the e2e environments Oct 19, 2023
@codecov
Copy link

codecov bot commented Oct 19, 2023

Codecov Report

Merging #16052 (6829641) into master (6624a61) will increase coverage by 1.36%.
Report is 4 commits behind head on master.
The diff coverage is 100.00%.

Flag Coverage Δ
active_directory 100.00% <ø> (+17.64%) ⬆️
activemq 52.87% <ø> (?)
activemq_xml 82.31% <ø> (ø)
amazon_msk 89.07% <ø> (ø)
ambari 85.75% <ø> (ø)
apache 95.08% <ø> (ø)
arangodb 98.23% <ø> (ø)
argocd 87.81% <ø> (ø)
aspdotnet 100.00% <ø> (ø)
avi_vantage 91.35% <ø> (ø)
azure_iot_edge 82.08% <ø> (ø)
boundary 100.00% <ø> (ø)
btrfs 82.91% <ø> (ø)
cacti 87.90% <ø> (ø)
calico 84.61% <ø> (ø)
cassandra 65.51% <ø> (?)
cert_manager 77.41% <ø> (ø)
cilium 77.63% <ø> (+0.87%) ⬆️
cisco_aci 95.27% <ø> (ø)
citrix_hypervisor 87.50% <ø> (ø)
cloud_foundry_api 96.35% <ø> (+0.12%) ⬆️
cloudera 99.49% <ø> (ø)
cockroachdb 91.52% <ø> (ø)
confluent_platform ?
consul 91.65% <ø> (ø)
coredns 94.57% <ø> (ø)
couch 95.43% <ø> (+0.24%) ⬆️
crio 89.79% <ø> (ø)
datadog_checks_base 89.66% <ø> (+9.12%) ⬆️
datadog_checks_dev 82.49% <ø> (+2.59%) ⬆️
datadog_checks_downloader 81.65% <ø> (ø)
datadog_cluster_agent 90.19% <ø> (ø)
dcgm 97.40% <ø> (ø)
ddev 87.23% <100.00%> (+0.56%) ⬆️
directory 95.87% <ø> (+0.65%) ⬆️
disk 89.23% <ø> (+4.02%) ⬆️
dns_check 93.90% <ø> (ø)
dotnetclr 91.39% <ø> (+12.90%) ⬆️
druid 98.47% <ø> (ø)
ecs_fargate 83.52% <ø> (+0.26%) ⬆️
eks_fargate 94.05% <ø> (ø)
envoy 95.09% <ø> (+0.41%) ⬆️
etcd 95.56% <ø> (ø)
external_dns 89.28% <ø> (ø)
fluentd 94.77% <ø> (ø)
foundationdb 78.50% <ø> (ø)
gearmand 78.26% <ø> (+1.24%) ⬆️
gitlab_runner 91.94% <ø> (ø)
go_expvar 92.73% <ø> (ø)
gunicorn 92.10% <ø> (ø)
harbor 89.68% <ø> (ø)
hazelcast 92.39% <ø> (ø)
hdfs_datanode 89.74% <ø> (ø)
hdfs_namenode 86.72% <ø> (ø)
hive 51.42% <ø> (?)
hivemq 61.90% <ø> (?)
http_check 95.51% <ø> (+2.05%) ⬆️
hudi 73.91% <ø> (?)
ibm_ace 91.89% <ø> (ø)
ibm_db2 95.35% <ø> (ø)
ibm_i 81.91% <ø> (ø)
ibm_mq 91.40% <ø> (+0.26%) ⬆️
ibm_was 96.08% <ø> (ø)
ignite 46.66% <ø> (?)
impala 97.97% <ø> (ø)
istio 77.74% <ø> (+0.52%) ⬆️
jboss_wildfly 47.36% <ø> (?)
kafka 63.63% <ø> (?)
kafka_consumer 93.23% <ø> (ø)
kong 87.56% <ø> (ø)
kube_apiserver_metrics 98.14% <ø> (ø)
kube_controller_manager 96.07% <ø> (ø)
kube_dns 95.97% <ø> (ø)
kube_metrics_server 94.87% <ø> (ø)
kube_proxy 96.80% <ø> (ø)
kube_scheduler 97.63% <ø> (ø)
kubelet 90.97% <ø> (ø)
kubernetes_state 89.18% <ø> (ø)
kyototycoon 85.96% <ø> (ø)
lighttpd 83.64% <ø> (ø)
linkerd 85.14% <ø> (+1.14%) ⬆️
linux_proc_extras 96.22% <ø> (ø)
mapr 82.70% <ø> (ø)
mapreduce 81.81% <ø> (ø)
marathon 83.43% <ø> (ø)
mcache 93.50% <ø> (ø)
mesos_master 89.75% <ø> (ø)
mesos_slave 93.63% <ø> (ø)
mongo 95.94% <ø> (ø)
nagios 89.01% <ø> (ø)
network 93.64% <ø> (+1.08%) ⬆️
nfsstat 95.20% <ø> (ø)
nginx 95.24% <ø> (+0.54%) ⬆️
nginx_ingress_controller 98.36% <ø> (ø)
openldap 96.79% <ø> (ø)
openmetrics 98.08% <ø> (ø)
openstack 51.45% <ø> (ø)
openstack_controller 91.12% <ø> (ø)
pgbouncer 91.33% <ø> (ø)
php_fpm 90.53% <ø> (+0.82%) ⬆️
postfix 88.04% <ø> (ø)
powerdns_recursor 96.65% <ø> (ø)
presto 59.09% <ø> (?)
process 85.42% <ø> (+0.28%) ⬆️
prometheus 94.17% <ø> (ø)
proxysql 98.97% <ø> (ø)
pulsar 100.00% <ø> (ø)
ray 96.45% <ø> (ø)
redisdb 87.78% <ø> (ø)
rethinkdb 97.93% <ø> (ø)
riak 99.22% <ø> (ø)
riakcs 93.61% <ø> (ø)
scylla 99.49% <ø> (ø)
silk 93.82% <ø> (ø)
singlestore 90.81% <ø> (ø)
snowflake 96.66% <ø> (ø)
solr 56.25% <ø> (?)
spark 93.91% <ø> (ø)
squid 100.00% <ø> (ø)
ssh_check 91.58% <ø> (ø)
statsd 87.36% <ø> (+1.05%) ⬆️
strimzi 89.70% <ø> (ø)
supervisord 90.14% <ø> (ø)
system_core 92.66% <ø> (ø)
system_swap 98.30% <ø> (ø)
tcp_check 91.58% <ø> (+1.34%) ⬆️
teamcity 88.74% <ø> (+3.21%) ⬆️
temporal 100.00% <ø> (ø)
teradata 94.06% <ø> (ø)
tls 92.18% <ø> (+0.82%) ⬆️
tokumx 58.40% <ø> (ø)
tomcat 61.29% <ø> (?)
torchserve 97.33% <ø> (ø)
traffic_server 96.13% <ø> (ø)
twemproxy 79.45% <ø> (ø)
twistlock 79.62% <ø> (ø)
varnish 84.39% <ø> (+0.26%) ⬆️
voltdb 96.85% <ø> (ø)
vsphere 95.79% <ø> (+0.06%) ⬆️
weaviate 76.27% <ø> (ø)
weblogic 71.73% <ø> (ø)
win32_event_log 86.98% <ø> (+0.66%) ⬆️
windows_performance_counters 98.36% <ø> (ø)
wmi_check 92.91% <ø> (ø)
yarn 89.59% <ø> (ø)
zk 83.08% <ø> (+1.73%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@FlorentClarret FlorentClarret force-pushed the florentclarret/ddev/env_start_agent_build_override branch from a84b35a to cbe2512 Compare October 19, 2023 07:43
@github-actions
Copy link

github-actions bot commented Oct 19, 2023

Test Results

    2 files      2 suites   4m 26s ⏱️
430 tests 425 ✔️   5 💤 0
860 runs  831 ✔️ 29 💤 0

Results for commit 6829641.

♻️ This comment has been updated with latest results.

@FlorentClarret FlorentClarret force-pushed the florentclarret/ddev/env_start_agent_build_override branch 2 times, most recently from 381a51d to 516da42 Compare October 19, 2023 08:04
@FlorentClarret FlorentClarret force-pushed the florentclarret/ddev/env_start_agent_build_override branch from 516da42 to 6c24411 Compare October 20, 2023 09:05
@FlorentClarret FlorentClarret changed the title Do not modify the agent build name if provided by the user when running the e2e environments Do not modify a custom agent build name provided by the user when running the e2e environments Oct 20, 2023
@FlorentClarret FlorentClarret marked this pull request as ready for review October 20, 2023 09:22
@FlorentClarret FlorentClarret requested review from a team as code owners October 20, 2023 09:22
iliakur
iliakur previously approved these changes Oct 20, 2023
Copy link
Contributor

@iliakur iliakur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have some vague memory of discussing this usecase (local agent images) specifically with you about a year ago!

I'm +1 to just give user total control over how the custom image is named.

@FlorentClarret
Copy link
Member Author

I have some vague memory of discussing this usecase (local agent images) specifically with you about a year ago!

I'm +1 to just give user total control over how the custom image is named.

IIRC our discussion was to be able to not always pull the image in case the image was built locally, this was introduced with the new ddev env test command #15931 (comment)

ddev/CHANGELOG.md Outdated Show resolved Hide resolved
Co-authored-by: Ursula Chen <[email protected]>
@FlorentClarret FlorentClarret merged commit 410bb53 into master Oct 23, 2023
@FlorentClarret FlorentClarret deleted the florentclarret/ddev/env_start_agent_build_override branch October 23, 2023 07:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants