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

Add new docker images to v2 pipeline for integration testing #756

Merged
merged 114 commits into from
Aug 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
06a8659
adding new images into the integration tests
oliveromahony Jul 24, 2024
56402db
double @
oliveromahony Jul 24, 2024
9c9497d
separate the compose fileS
oliveromahony Jul 24, 2024
87fba64
invalid docker-compose
oliveromahony Jul 24, 2024
9ac20d3
changes
oliveromahony Jul 24, 2024
21a05fa
wip: fix tests
oliveromahony Jul 24, 2024
bfd8179
update from
oliveromahony Jul 24, 2024
9bb9630
check if file path is the issue
aphralG Jul 29, 2024
2d1c079
check if file path is the issue
aphralG Jul 29, 2024
de74ad6
try this
aphralG Jul 29, 2024
f23f233
try this
aphralG Jul 29, 2024
66b6735
try this part 2
aphralG Jul 30, 2024
ebc72a2
try this part 2
aphralG Jul 30, 2024
0dc04f3
try this part 3
aphralG Jul 30, 2024
435a05c
Update docker-compose-apk.yml
oliveromahony Jul 30, 2024
ee3a2c1
check directory
aphralG Jul 30, 2024
1fb6fd7
check directory
aphralG Jul 30, 2024
047a545
check directory
aphralG Jul 30, 2024
acfd521
check directory
aphralG Jul 30, 2024
14d08e5
check directory
aphralG Jul 30, 2024
61b2f85
check directory
aphralG Jul 30, 2024
dcecd5f
check directory
aphralG Jul 30, 2024
32923ac
check directory
aphralG Jul 30, 2024
472c69f
check directory
aphralG Jul 30, 2024
d06c221
try again
aphralG Jul 30, 2024
bea48f2
remove install test for now
aphralG Jul 30, 2024
4689fba
remove install test for now
aphralG Jul 30, 2024
4f55068
remove install test for now
aphralG Jul 30, 2024
083c39f
just try one test at a time
aphralG Jul 30, 2024
3657115
try this
aphralG Jul 31, 2024
6b3a18f
try this
aphralG Jul 31, 2024
4101143
try this
aphralG Jul 31, 2024
62e746e
try this
aphralG Jul 31, 2024
360045d
try this
aphralG Jul 31, 2024
7b48c18
try this
aphralG Jul 31, 2024
aaff887
try api test instead
aphralG Jul 31, 2024
f804d94
try api test instead
aphralG Jul 31, 2024
31e3c01
add agent config
aphralG Jul 31, 2024
3bcf402
add features test
aphralG Jul 31, 2024
7191d2b
add features test
aphralG Jul 31, 2024
fe372c6
add grpc tests back in
aphralG Jul 31, 2024
7909b87
add grpc tests back in
aphralG Jul 31, 2024
8288b98
add back in test
aphralG Jul 31, 2024
553cb62
add back in test
aphralG Jul 31, 2024
8ba5a7d
add back in test
aphralG Jul 31, 2024
f8cfc74
check logs
aphralG Jul 31, 2024
c481f78
check logs
aphralG Jul 31, 2024
8890292
check logs
aphralG Jul 31, 2024
fff5ebd
try removing link
aphralG Jul 31, 2024
9f2b708
try removing link
aphralG Jul 31, 2024
d5ef6a3
try removing link
aphralG Jul 31, 2024
c0e07cb
add back some tests
aphralG Jul 31, 2024
1064e88
make deps
aphralG Jul 31, 2024
5b6a717
add install test back
aphralG Jul 31, 2024
dd09639
add install test back
aphralG Jul 31, 2024
ed24390
add install test back
aphralG Jul 31, 2024
5897b19
add install test back
aphralG Jul 31, 2024
9996064
remove install test to check others
aphralG Aug 1, 2024
c9c6a56
try pass path
aphralG Aug 1, 2024
13ab5f8
try pass path
aphralG Aug 1, 2024
290eeca
try this
aphralG Aug 1, 2024
d350b79
try this
aphralG Aug 1, 2024
b29769b
try this
aphralG Aug 1, 2024
a9f2d0c
try this
aphralG Aug 1, 2024
a893e10
try this
aphralG Aug 1, 2024
7f61669
try this
aphralG Aug 1, 2024
7b225b0
try changing tag
aphralG Aug 1, 2024
86b0dab
try new format
aphralG Aug 1, 2024
0cc8b59
change wait
aphralG Aug 1, 2024
e11181d
start clean up
aphralG Aug 1, 2024
3896846
start clean up
aphralG Aug 1, 2024
871b7de
start clean up
aphralG Aug 1, 2024
f20232b
start clean up
aphralG Aug 1, 2024
1aea089
start clean up
aphralG Aug 1, 2024
60b1963
start clean up
aphralG Aug 1, 2024
51d9ad2
start clean up
aphralG Aug 1, 2024
81f7fc2
start clean up
aphralG Aug 1, 2024
d4f6dc0
try reload nginx
aphralG Aug 2, 2024
94543fd
try reload nginx
aphralG Aug 2, 2024
4b28f97
try reload nginx
aphralG Aug 2, 2024
b85120c
try reload nginx
aphralG Aug 2, 2024
4bb60ce
try reload nginx
aphralG Aug 2, 2024
5265e51
try reload nginx
aphralG Aug 2, 2024
1398883
try reload nginx
aphralG Aug 2, 2024
78b0d39
try this
aphralG Aug 2, 2024
17ff810
try loggin config
aphralG Aug 2, 2024
6221c16
try copy config
aphralG Aug 2, 2024
f192750
check config
aphralG Aug 6, 2024
f7f8987
check nginx is running
aphralG Aug 6, 2024
b646975
check nginx is running
aphralG Aug 6, 2024
dbd68f0
install
aphralG Aug 6, 2024
7545cb7
install
aphralG Aug 6, 2024
eaf5e96
nginx oss
aphralG Aug 6, 2024
994a87b
fix tag
aphralG Aug 6, 2024
99ae9fe
fix
aphralG Aug 6, 2024
56f6821
try plus image
aphralG Aug 6, 2024
f186449
fix naming
aphralG Aug 6, 2024
41a4dad
fix naming
aphralG Aug 6, 2024
9eb47a1
clean up
aphralG Aug 6, 2024
da8cef0
try alpine
aphralG Aug 6, 2024
a33cb13
try alpine
aphralG Aug 6, 2024
dda7b08
rename job
aphralG Aug 6, 2024
2ef06b3
fix naming
aphralG Aug 6, 2024
d6203ff
try new tag
aphralG Aug 7, 2024
432acbe
try new tag
aphralG Aug 7, 2024
3df74ab
tag fix
aphralG Aug 7, 2024
397ee98
fix wait log
aphralG Aug 7, 2024
1455b80
remove duplicate docker compose
aphralG Aug 7, 2024
6d52780
fix test
aphralG Aug 7, 2024
a60ac4a
pr feedback
aphralG Aug 8, 2024
8437617
try remove duplicate dockerfiles
aphralG Aug 8, 2024
53a29b6
try remove duplicate dockerfiles
aphralG Aug 8, 2024
54fa422
pr
aphralG Aug 13, 2024
8d0c4ab
Merge branch 'main' into integration-tests-using-oss-repo
aphralG Aug 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
start clean up
aphralG committed Aug 1, 2024
commit e11181d4be26ad68deef12ce7798a8c1f21b2328
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -120,7 +120,6 @@ jobs:
container:
- image: "ubuntu"
version: "24.04"
path: "/nginx-plus/base"
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
@@ -142,7 +141,7 @@ jobs:
- name: Run Integration Tests
run: |
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" OS_RELEASE="${{ matrix.container.image }}" OS_VERSION="${{ matrix.container.version }}" IMAGE_PATH=${{matrix.container.path}}\
CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" OS_RELEASE="${{ matrix.container.image }}" OS_VERSION="${{ matrix.container.version }}"\
make new-integration-test
- name: Container Output Logs
if: failure()
@@ -169,8 +168,6 @@ jobs:
container:
- image: "debian"
version: "bullseye-slim"
- image: "debian"
version: "bookworm-slim"
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
18 changes: 10 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -45,6 +45,8 @@ BASE_IMAGE = "${CONTAINER_REGISTRY}/${OS_RELEASE}:${OS_VERSION}"
IMAGE_TAG = "agent_${OS_RELEASE}_${OS_VERSION}"
NGINX_TAG = stable
NGINX_PLUS_TAG = r32-debian-bookworm
AGENT_IMAGE_PATH = "/nginx-plus/agent"
AGENTLESS_IMAGE_PATH = "/nginx-plus/base"

VERSION_WITH_V := v${VERSION}
LDFLAGS = "-w -X main.version=${VERSION_WITH_V} -X main.commit=${COMMIT} -X main.date=${DATE}"
@@ -226,17 +228,17 @@ integration-test:
${GOTEST} -v ./test/integration/grpc

new-integration-test:
aphralG marked this conversation as resolved.
Show resolved Hide resolved
# PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} \
# OS_RELEASE=${OS_RELEASE} TAG=${NGINX_TAG} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} IMAGE_PATH=${IMAGE_PATH} DOCKER_COMPOSE_FILE="docker-compose-${CONTAINER_OS_TYPE}-new.yml" \
# ${GOTEST} -v ./test/integration/api
PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} \
OS_RELEASE=${OS_RELEASE} TAG=${NGINX_TAG} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} IMAGE_PATH=${IMAGE_PATH} DOCKER_COMPOSE_FILE="docker-compose-${CONTAINER_OS_TYPE}-new.yml" \
${GOTEST} -v ./test/integration/api
PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} \
OS_RELEASE=${OS_RELEASE} TAG=${NGINX_PLUS_TAG} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} DOCKER_COMPOSE_FILE="docker-compose-${CONTAINER_OS_TYPE}-new.yml" \
${GOTEST} -v ./test/integration/install
# PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} \
# OS_RELEASE=${OS_RELEASE} TAG=${NGINX_TAG} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} IMAGE_PATH=${IMAGE_PATH} DOCKER_COMPOSE_FILE="docker-compose-${CONTAINER_OS_TYPE}-new.yml" \
# ${GOTEST} -v ./test/integration/features
# PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} \
# OS_RELEASE=${OS_RELEASE} TAG=${NGINX_TAG} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} IMAGE_PATH=${IMAGE_PATH} DOCKER_COMPOSE_FILE="docker-compose-${CONTAINER_OS_TYPE}-new.yml" \
PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} \
OS_RELEASE=${OS_RELEASE} TAG=${NGINX_TAG} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} IMAGE_PATH=${IMAGE_PATH} DOCKER_COMPOSE_FILE="docker-compose-${CONTAINER_OS_TYPE}-new.yml" \
${GOTEST} -v ./test/integration/features
PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} \
OS_RELEASE=${OS_RELEASE} TAG=${NGINX_TAG} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} IMAGE_PATH=${IMAGE_PATH} DOCKER_COMPOSE_FILE="docker-compose-${CONTAINER_OS_TYPE}-new.yml" \
${GOTEST} -v ./test/integration/grpc

test-bench: ## Run benchmark tests
3 changes: 2 additions & 1 deletion test/docker/agentless/deb/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ARG CONTAINER_NGINX_IMAGE_REGISTRY
ARG TAG
ARG IMAGE_PATH
ARG CONTAINER_OS_TYPE
FROM ${CONTAINER_NGINX_IMAGE_REGISTRY}${IMAGE_PATH}:${TAG} AS install
LABEL maintainer="NGINX Docker Maintainers <[email protected]>"

@@ -10,7 +11,7 @@ ARG DEBIAN_FRONTEND=noninteractive
ARG PACKAGE_NAME

WORKDIR /agent
COPY ./build/${PACKAGE_NAME}.deb /agent/build/${PACKAGE_NAME}.deb
COPY ./build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE} /agent/build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE}
COPY ./ /agent

FROM install AS runtime
2 changes: 1 addition & 1 deletion test/integration/api/docker-compose-deb-new.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ services:
agent:
build:
context: ../../../
dockerfile: ./test/docker/oss/deb/Dockerfile
dockerfile: ./test/docker/oss/${CONTAINER_OS_TYPE}/Dockerfile
target: runtime
args:
PACKAGE_NAME: ${PACKAGE_NAME}