Skip to content

Commit

Permalink
chore(tests): fixed broken ami filters that contain
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbruzina
mbruzina committed Mar 31, 2023
1 parent 79cc325 commit 196832e
Show file tree
Hide file tree
Showing 29 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/awslinux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ install:
# wait for status endpoint to be ready
while [ $TRIES -lt $MAX_RETRIES ]; do
((TRIES++))
statusCheckOutput=$(curl http://localhost:18003/v1/status/errors -s)
statusCheckOutput=$(curl http://localhost:18003/v1/status/erors -sr)
if [ "$statusCheckOutput" == "{}" ]; then
echo "Agent status check ok."
break
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/ub20-apt-docker-jboss.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.medium",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/ub20-apt-docker-tomcat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/java/ub20-apt-sysd-tomcat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}
],
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-apache-fpm-wordpress-ubuntu18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}
],
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-apache-wordpress-ubuntu18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}
],
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/apm/php-agent/php-nginx-fpm-wordpress-ubuntu18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}
],
Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/ubuntu16-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/ubuntu18-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/infra-agent/debians/ubuntu20-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/definitions-eu/smoke/ubuntu20-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/dotNet/linux/ubuntu20-nginx-aspnetcore.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/java/linux/jboss/docker/ub20-apt-docker.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.medium",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/java/linux/jboss/docker/ub20-docker-rest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.medium",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/java/linux/jboss/docker/ub20-dockertomcat-jboss.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.medium",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/java/linux/jboss/docker/ub20-tomcat-jboss.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.medium",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/java/linux/tomcat/docker/ub20-apt-docker-tomcat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/java/linux/tomcat/docker/ub20-docker-rest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.medium",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/java/linux/tomcat/systemd/ub20-apt-sysd-tomcat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}],
"services": [
Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/php-agent/php-apache-fpm-wordpress-ubuntu18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/php-agent/php-apache-wordpress-ubuntu18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/apm/php-agent/php-nginx-fpm-wordpress-ubuntu18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/infra-agent/ubuntu16-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-????????",
"user_name": "ubuntu"
}]
}
2 changes: 1 addition & 1 deletion test/manual/definitions/infra-agent/ubuntu18-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}]
}
2 changes: 1 addition & 1 deletion test/manual/definitions/infra-agent/ubuntu20-infra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.nano",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
"user_name": "ubuntu"
}]
}
2 changes: 1 addition & 1 deletion test/manual/definitions/ohi-auto-config/linux/apache-mysql-ubuntu18-auto.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down
2 changes: 1 addition & 1 deletion test/manual/definitions/ohi/linux/apache-mysql-ubuntu18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
"ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
"user_name": "ubuntu"
}],

Expand Down

0 comments on commit 196832e

Please sign in to comment.