Skip to content

Commit 9c2895b

Browse files
john-david3john-david3
committed
remove alpine
1 parent 87e8e86 commit 9c2895b

File tree

4 files changed

+11
-25
lines changed

4 files changed

+11
-25
lines changed

‎Makefile‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,19 +222,19 @@ performance-test: ## Run performance tests
222222

223223
integration-test:
224224
PACKAGES_REPO=${OSS_PACKAGES_REPO} INSTALL_FROM_REPO=${INSTALL_FROM_REPO} PACKAGE_NAME=${PACKAGE_NAME} BASE_IMAGE=${BASE_IMAGE} IMAGE_PATH=${IMAGE_PATH} TAG=${IMAGE_TAG} \
225-
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} ARCH=${OSARCH} \
225+
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} \
226226
${GOTEST} -v ./test/integration/install
227227
PACKAGES_REPO=${OSS_PACKAGES_REPO} INSTALL_FROM_REPO=${INSTALL_FROM_REPO} PACKAGE_NAME=${PACKAGE_NAME} BASE_IMAGE=${BASE_IMAGE} BUILD_TARGET="install-agent-local" IMAGE_PATH=${IMAGE_PATH} TAG=${IMAGE_TAG} \
228-
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} ARCH=${OSARCH} \
228+
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} \
229229
${GOTEST} -v ./test/integration/api
230230
PACKAGES_REPO=${OSS_PACKAGES_REPO} INSTALL_FROM_REPO=${INSTALL_FROM_REPO} PACKAGE_NAME=${PACKAGE_NAME} BASE_IMAGE=${BASE_IMAGE} BUILD_TARGET="install-agent-local" IMAGE_PATH=${IMAGE_PATH} TAG=${IMAGE_TAG} \
231-
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} ARCH=${OSARCH} \
231+
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} \
232232
${GOTEST} -v ./test/integration/features
233233
PACKAGES_REPO=${OSS_PACKAGES_REPO} INSTALL_FROM_REPO=${INSTALL_FROM_REPO} PACKAGE_NAME=${PACKAGE_NAME} BASE_IMAGE=${BASE_IMAGE} BUILD_TARGET="install-agent-local" IMAGE_PATH=${IMAGE_PATH} TAG=${IMAGE_TAG} \
234-
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} ARCH=${OSARCH} \
234+
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} \
235235
${GOTEST} -v ./test/integration/grpc
236236
PACKAGES_REPO=${OSS_PACKAGES_REPO} INSTALL_FROM_REPO=${INSTALL_FROM_REPO} PACKAGE_NAME=${PACKAGE_NAME} BASE_IMAGE=${BASE_IMAGE} BUILD_TARGET="install-agent-local" IMAGE_PATH=${IMAGE_PATH} TAG=${IMAGE_TAG} \
237-
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} ARCH=${OSARCH} \
237+
OS_VERSION=${OS_VERSION} OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} DOCKERFILE_PATH=${DOCKERFILE_PATH} \
238238
${GOTEST} -v ./test/integration/upgrade
239239

240240
official-image-integration-test:
@@ -247,9 +247,6 @@ official-image-integration-test:
247247
PACKAGES_REPO=${OSS_PACKAGES_REPO} PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} BASE_IMAGE=${BASE_IMAGE} IMAGE_PATH=${IMAGE_PATH} TAG=${TAG} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} BUILD_TARGET="install" \
248248
OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} DOCKERFILE_PATH=${OFFICIAL_IMAGE_DOCKERFILE_PATH} \
249249
${GOTEST} -v ./test/integration/api
250-
PACKAGES_REPO=${OSS_PACKAGES_REPO} PACKAGE_NAME=${PACKAGE_NAME} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} BASE_IMAGE=${BASE_IMAGE} IMAGE_PATH=${IMAGE_PATH} TAG=${TAG} ARCH=${OSARCH} OS_VERSION=${OS_VERSION} BUILD_TARGET="install" \
251-
OS_RELEASE=${OS_RELEASE} CONTAINER_OS_TYPE=${CONTAINER_OS_TYPE} DOCKERFILE_PATH=${OFFICIAL_IMAGE_DOCKERFILE_PATH} \
252-
${GOTEST} -v ./test/integration/upgrade
253250

254251
test-performance-run: ## Run benchmark performance tests
255252
cd test/performance && GOWORK=off CGO_ENABLED=0 ${GOTEST} -mod=vendor -count 5 -timeout 2m -bench=. -benchmem metrics_test.go

‎test/docker/nginx-official-image/deb/Dockerfile‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@ ARG IMAGE_PATH
44
FROM ${CONTAINER_NGINX_IMAGE_REGISTRY}${IMAGE_PATH}:${TAG} AS install
55
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
66

7-
ARG TAG
87
ARG OS_RELEASE
98
ARG OS_VERSION
109
ARG DEBIAN_FRONTEND=noninteractive
1110
ARG PACKAGE_NAME
12-
ARG PACKAGES_REPO
1311
ARG CONTAINER_OS_TYPE
14-
ARG ARCH
1512

1613
WORKDIR /agent
1714
COPY ./build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE} /agent/build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE}
@@ -20,9 +17,5 @@ RUN apt-get update \
2017
&& apt install --no-install-recommends --no-install-suggests --allow-downgrades -y /agent/build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE} \
2118
&& rm /agent/build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE}
2219

23-
RUN if echo "$TAG" | grep -q "bookworm" ; then \
24-
curl -O https://${PACKAGES_REPO}/nginx-agent/debian/pool/agent/n/nginx-agent/nginx-agent_3.2.1~bookworm_${ARCH}.deb; \
25-
fi
26-
2720
RUN unlink /var/log/nginx/access.log
2821
RUN unlink /var/log/nginx/error.log

‎test/integration/upgrade/upgrade_test.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ const (
2525

2626
var (
2727
osRelease = os.Getenv("OS_RELEASE")
28-
osArch = os.Getenv("ARCH")
2928
serverHost = map[string]string{
3029
"NGINX_AGENT_SERVER_HOST": "127.0.0.1",
3130
}
@@ -61,6 +60,11 @@ func TestUpgradeV2ToV3(t *testing.T) {
6160
params,
6261
)
6362

63+
// skip alpine due to upgrade script issues until bug is resolved
64+
if strings.Contains(osRelease, "alpine") {
65+
t.Skip("Skipping test because of ALPINE")
66+
}
67+
6468
// upgrade the agent to v3, check the upgrade time and verify the logs
6569
verifyAgentUpgrade(ctx, t, testContainer)
6670

@@ -154,16 +158,10 @@ func verifyAgentConfigFile(ctx context.Context, t *testing.T, testContainer test
154158
func upgradeAgent(ctx context.Context, t *testing.T, testContainer testcontainers.Container) (time.Duration, io.Reader) {
155159
var updatePkgCmd []string
156160
var upgradeAgentCmd []string
157-
officialDebPackage := "./nginx-agent_3.2.1~bookworm_" + osArch + ".deb"
158161

159162
if strings.Contains(osRelease, "ubuntu") || strings.Contains(osRelease, "debian") {
160163
updatePkgCmd = []string{"apt-get", "update"}
161-
if os.Getenv("GITHUB_JOB") == "integration-tests" {
162-
upgradeAgentCmd = []string{"apt-get", "install", "-y", "--only-upgrade", "nginx-agent", "-o", "Dpkg::Options::=--force-confold"}
163-
} else {
164-
upgradeAgentCmd = []string{"apt-get", "install", "-y", officialDebPackage, "-o", "Dpkg::Options::=--force-confold"}
165-
}
166-
164+
upgradeAgentCmd = []string{"apt-get", "install", "-y", "--only-upgrade", "nginx-agent", "-o", "Dpkg::Options::=--force-confold"}
167165
} else if strings.Contains(osRelease, "alpine") {
168166
updatePkgCmd = []string{"apk", "update"}
169167
upgradeAgentCmd = []string{"apk", "add", "nginx-agent=3.2.1"}

‎test/integration/utils/test_container_utils.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ func StartContainer(
5151
tag := Env(tb, "TAG")
5252
imagePath := Env(tb, "IMAGE_PATH")
5353
containerOsType := Env(tb, "CONTAINER_OS_TYPE")
54-
osArch := Env(tb, "ARCH")
5554

5655
req := testcontainers.ContainerRequest{
5756
FromDockerfile: testcontainers.FromDockerfile{
@@ -70,7 +69,6 @@ func StartContainer(
7069
"IMAGE_PATH": ToPtr(imagePath),
7170
"TAG": ToPtr(tag),
7271
"CONTAINER_OS_TYPE": ToPtr(containerOsType),
73-
"ARCH": ToPtr(osArch),
7472
},
7573
BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
7674
buildOptions.Target = buildTarget

0 commit comments

Comments
 (0)