Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 0 additions & 16 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,6 @@ jobs:
path: image-info/${{ matrix.image-flavor }}.txt
retention-days: 1

test-cci-export:
runs-on: ubuntu-latest
needs:
- build-and-push-builder-images
- build-and-push-test-images
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
- name: Test cci-export in a context similar to how it is used in CI
run: |
docker login -u "$QUAY_STACKROX_IO_RW_USERNAME" --password-stdin <<<"$QUAY_STACKROX_IO_RW_PASSWORD" quay.io
make test-cci-export

comment-build-images:
runs-on: ubuntu-latest
needs:
Expand Down
12 changes: 0 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,6 @@ stackrox-ui-test-image:
-f images/stackrox-ui-test.Dockerfile \
images/

.PHONY: test-cci-export
test-cci-export:
$(DOCKER) build \
--platform linux/amd64 \
-t test-cci-export \
--build-arg BASE_TAG=$(STACKROX_TEST_TAG) \
-f images/test.cci-export.Dockerfile \
images/
$(DOCKER) run \
--rm \
test-cci-export

.PHONY: scanner-build-image
scanner-build-image:
$(DOCKER) build \
Expand Down
7 changes: 0 additions & 7 deletions images/jenkins-plugin.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,4 @@ RUN set -ex \
&& sudo apt upgrade \
&& sudo rm -rf /var/lib/apt/lists/*

COPY ./static-contents/bin/bash-wrapper /bin/

RUN \
sudo mv /bin/bash /bin/real-bash && \
sudo mv /bin/bash-wrapper /bin/bash && \
sudo chmod 755 /bin/bash

USER circleci
8 changes: 0 additions & 8 deletions images/scanner-test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ RUN set -ex \
bash -c 'dir="$(dirname "${1}")"; new_dir="${dir#/static-tmp}"; mkdir -p "${new_dir}"; cp "${1}" "${new_dir}";' -- {} \
&& rm -r /static-tmp

# Circle CI uses BASH_ENV to pass an environment for bash. Other environments need
# an initial BASH_ENV as a foundation for cci-export().
ENV BASH_ENV /etc/initial-bash.env

# PostgreSQL environment.
ENV PG_MAJOR=15
ENV PATH="$PATH:/usr/pgsql-$PG_MAJOR/bin/"
Expand Down Expand Up @@ -120,7 +116,3 @@ RUN { \
echo "oc=$(oc version --client)"; \
echo "yq=$(yq --version)"; \
} > /i-am-rox-ci-image

RUN \
mv /bin/bash /bin/real-bash && \
mv /bin/bash-wrapper /bin/bash
7 changes: 0 additions & 7 deletions images/stackrox-test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ RUN set -ex \
&& find /static-tmp -type f -print0 | \
xargs -0 -I '{}' -n1 bash -c 'dir="$(dirname "${1}")"; new_dir="${dir#/static-tmp}"; mkdir -p "${new_dir}"; cp "${1}" "${new_dir}";' -- {} \
&& rm -r /static-tmp
# Circle CI uses BASH_ENV to pass an environment for bash. Other environments need
# an initial BASH_ENV as a foundation for cci-export().
ENV BASH_ENV /etc/initial-bash.env

# Install Postgres repo
RUN dnf --disablerepo="*" install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm
Expand Down Expand Up @@ -186,7 +183,3 @@ RUN { \
echo "vault=$(vault --version)"; \
echo "yq=$(yq --version)"; \
} > /i-am-rox-ci-image

RUN \
mv /bin/bash /bin/real-bash && \
mv /bin/bash-wrapper /bin/bash
7 changes: 0 additions & 7 deletions images/stackrox-ui-test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ RUN set -ex \
&& find /static-tmp -type f -print0 | \
xargs -0 -I '{}' -n1 bash -c 'dir="$(dirname "${1}")"; new_dir="${dir#/static-tmp}"; mkdir -p "${new_dir}"; cp "${1}" "${new_dir}";' -- {} \
&& rm -r /static-tmp
# Circle CI uses BASH_ENV to pass an environment for bash. Other environments need
# an initial BASH_ENV as a foundation for cci-export().
ENV BASH_ENV /etc/initial-bash.env

# Setup and install some prerequities
RUN dnf update -y \
Expand Down Expand Up @@ -241,7 +238,3 @@ RUN { \
echo "yarn=$(yarn --version)"; \
echo "yq=$(yq --version)"; \
} > /i-am-rox-ci-image

RUN \
mv /bin/bash /bin/real-bash && \
mv /bin/bash-wrapper /bin/bash
64 changes: 0 additions & 64 deletions images/static-contents/bin/bash-wrapper

This file was deleted.

2 changes: 0 additions & 2 deletions images/static-contents/etc/initial-bash.env

This file was deleted.

8 changes: 0 additions & 8 deletions images/test.cci-export.Dockerfile

This file was deleted.

204 changes: 0 additions & 204 deletions images/test/bats/cci-export.bats

This file was deleted.

Loading
Loading