Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Commit

Permalink
Merge pull request #29 from scality/bugfix/EVE-1165-api-auth-restore
Browse files Browse the repository at this point in the history
EVE-1165 restore API auth when oauth is enabled
  • Loading branch information
tcarmet authored Jul 19, 2021
2 parents cfc55c1 + 8f558c9 commit 79426c0
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 689 deletions.
10 changes: 5 additions & 5 deletions build/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ stages:
haltOnFailure: True
- ShellCommand:
name: run static analysis tools
command: tox --sitepackages -e lint
command: tox -e lint
usePTY: true
- ShellCommand:
name: Ensure the release notes compile
command: tox --sitepackages -e relnotes -- test_version
command: tox -e relnotes -- test_version
usePTY: true
- ShellCommand:
name: Ensure the doc compiles
command: tox --sitepackages -e doc
command: tox -e doc
usePTY: true
- ShellCommand:
name: check helm packaging eve
Expand All @@ -72,15 +72,15 @@ stages:
command: helm lint charts/eve-doc
- ShellCommand:
name: run unit tests
command: tox --sitepackages -e unit
command: tox -e unit
usePTY: true
- ShellCommand:
name: run system utils tests
command: tox -e testutil
usePTY: true
- ShellCommand:
name: run system tests
command: tox --sitepackages -e system
command: tox -e system
haltOnFailure: True
usePTY: true
- Upload:
Expand Down
2 changes: 1 addition & 1 deletion build/workers/docker_tests/requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https:/
apt-get update && apt-get install -y kubectl

# Install Kind
curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.10.0/kind-linux-amd64
curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.10.0/kind-linux-amd64
chmod +x ./kind
mv kind /usr/local/bin/
# Create kind cluster
Expand Down
10 changes: 2 additions & 8 deletions build/workers/focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /tmp/packages.list

COPY ./requirements.txt /tmp

RUN pip3 install --upgrade pip==21.0.1
RUN pip3 install --no-binary buildbot --no-cache-dir -r /tmp/requirements.txt \
&& rm -f /tmp/requirements.txt

# Install Helm
ARG HELM_VERSION=3.5.4
Expand All @@ -35,14 +31,12 @@ RUN adduser -u 1042 --home /home/eve --disabled-password --gecos "" eve \

USER eve

RUN mkdir -p /home/eve/workspace/ \
&& mkdir -p /home/eve/.ssh/ \
&& /bin/echo -e "Host bitbucket.org\n\tStrictHostKeyChecking no\n" >> /home/eve/.ssh/config
RUN mkdir -p /home/eve/workspace/

#
# Run buildbot-worker on startup
#
ARG BUILDBOT_VERSION
ARG BUILDBOT_VERSION=2.7.0
RUN sudo pip3 install buildbot-worker==$BUILDBOT_VERSION

WORKDIR /home/eve/workspace
Expand Down
1 change: 1 addition & 0 deletions build/workers/focal/packages.list
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ python3-dev
python3-pip
sudo
wget
tox
21 changes: 0 additions & 21 deletions build/workers/focal/requirements.in

This file was deleted.

Loading

0 comments on commit 79426c0

Please sign in to comment.