From 4858a31f84fb58bc90c64621dccdaacbe1dad630 Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Wed, 22 Feb 2023 12:31:13 +0000 Subject: [PATCH] fixup! e2e: add distribution tests Signed-off-by: Justin Chadwell --- .github/e2e/distribution/install.sh | 6 +++--- .github/workflows/e2e.yml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/e2e/distribution/install.sh b/.github/e2e/distribution/install.sh index 96d9343..bf100ae 100755 --- a/.github/e2e/distribution/install.sh +++ b/.github/e2e/distribution/install.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash set -eu -: "${DISTRIBUTION_VERSION:=registry:2}" +: "${DISTRIBUTION_VERSION:=2}" : "${DISTRIBUTION_HOST:=localhost}" : "${DISTRIBUTION_PORT:=8080}" -echo "::group::Starting ${DISTRIBUTION_VERSION}}" +echo "::group::Starting registry:${DISTRIBUTION_VERSION}" ( set -x - docker run -d --name registry -p "5000:${DISTRIBUTION_PORT}" "${DISTRIBUTION_VERSION}" + docker run -d --name registry -p "${DISTRIBUTION_PORT}:5000" "registry:${DISTRIBUTION_VERSION}" ) echo "::endgroup::" \ No newline at end of file diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index bee9670..22b906e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -27,6 +27,7 @@ env: BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1 HARBOR_VERSION: v2.7.0 NEXUS_VERSION: 3.47.1 + DISTRIBUTION_VERSION: 2.8.1 jobs: build: @@ -173,7 +174,7 @@ jobs: network=host - name: Login to Registry - if: github.event_name != 'pull_request' && env.REGISTRY_USER != '' + if: github.event_name != 'pull_request' && (env.REGISTRY_USER || matrix.username_secret) != '' uses: docker/login-action@v2 with: registry: ${{ env.REGISTRY_FQDN || matrix.registry }}