Skip to content

Commit

Permalink
WIP - passing tests, no azdev linting/etc
Browse files Browse the repository at this point in the history
  • Loading branch information
SudoBrendan committed Feb 10, 2024
1 parent 9eb8db1 commit 0adcbce
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
14 changes: 14 additions & 0 deletions Dockerfile.ci-az-aro
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM docker.io/library/python:3.10 AS az-aro-base
WORKDIR /build/
COPY requirements.txt .
RUN pip install -U pip \
&& pip install -r requirements.txt

# untracked testing deps
RUN pip install azure.mgmt.core
RUN pip install azure.cli

COPY python/ .
# TODO: azdev linting??? Getting "TypeError: expected str, bytes or os.PathLike object, not NoneType" - for ... maybe... $HOME?
RUN pip install pytest
RUN pytest --ignore=az/aro/azext_aro/tests/latest/integration
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ COMMIT = $(shell git rev-parse --short=7 HEAD)$(shell [[ $$(git status --porcela
ARO_IMAGE_BASE = ${RP_IMAGE_ACR}.azurecr.io/aro
E2E_FLAGS ?= -test.v --ginkgo.v --ginkgo.timeout 180m --ginkgo.flake-attempts=2 --ginkgo.junit-report=e2e-report.xml
GO_FLAGS ?= -tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper
NO_CACHE ?= true

export GOFLAGS=$(GO_FLAGS)

Expand Down Expand Up @@ -74,6 +75,9 @@ clean:
client: generate
hack/build-client.sh "${AUTOREST_IMAGE}" 2020-04-30 2021-09-01-preview 2022-04-01 2022-09-04 2023-04-01 2023-07-01-preview 2023-09-04 2023-11-22

ci-az-aro:
docker build . -f Dockerfile.ci-az-aro --build-arg REGISTRY=$(REGISTRY) --no-cache=$(NO_CACHE)

# TODO: hard coding dev-config.yaml is clunky; it is also probably convenient to
# override COMMIT.
deploy:
Expand Down Expand Up @@ -254,4 +258,4 @@ vendor:
# See comments in the script for background on why we need it
hack/update-go-module-dependencies.sh

.PHONY: admin.kubeconfig aks.kubeconfig aro az clean client deploy dev-config.yaml discoverycache generate image-aro-multistage image-fluentbit image-proxy lint-go runlocal-rp proxy publish-image-aro-multistage publish-image-fluentbit publish-image-proxy secrets secrets-update e2e.test tunnel test-e2e test-go test-python vendor build-all validate-go unit-test-go coverage-go validate-fips
.PHONY: admin.kubeconfig aks.kubeconfig aro az ci-az-aro clean client deploy dev-config.yaml discoverycache generate image-aro-multistage image-fluentbit image-proxy lint-go runlocal-rp proxy publish-image-aro-multistage publish-image-fluentbit publish-image-proxy secrets secrets-update e2e.test tunnel test-e2e test-go test-python vendor build-all validate-go unit-test-go coverage-go validate-fips
2 changes: 2 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
azure.mgmt.core=1.4.0
azure.cli=2.57.0

0 comments on commit 0adcbce

Please sign in to comment.