redhat-openshift-ecosystem · mantomas · Jun 24, 2021 · Jun 24, 2021 · Jun 25, 2021 · Jun 28, 2021
diff --git a/.ansible-lint b/.ansible-lint
@@ -2,11 +2,10 @@
 exclude_paths:
   - .cache/  # implicit unless exclude_paths is defined in config
   - .github/
-  - roles/
   - Dockerfiles
-  - ./*.yml
+  - yamllint.yml
 
-warn_list: [] # or 'skip_list' to silence them completely
+warn_list: []  # or 'skip_list' to silence them completely
 
 skip_list:
   - deprecated-command-syntax  # Using command rather than an argument to e.g. file
@@ -17,4 +16,3 @@ skip_list:
   - command-instead-of-shell  # Use shell only when shell functionality is required
   # - yaml  # Violations reported by yamllint
   - line-length
-  - comments
diff --git a/.github/workflows/build_and_push_image_on_tag.yml b/.github/workflows/build_and_push_image_on_tag.yml
@@ -33,7 +33,6 @@ jobs:
           git checkout $latestTag
           echo "Latest tag is $latestTag"
           podman --version
-          cd Dockerfiles/midstream/
-          podman build -t midstream_image:$latestTag -f Dockerfile --build-arg OPERATOR_SDK_VERSION=v1.4.0 --build-arg OPERATOR_TEST_PLAYBOOKS_TAG=$latestTag
+          podman build -t midstream_image:$latestTag -f Dockerfiles/midstream/Dockerfile .
           podman login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io
-          podman push midstream_image:$latestTag quay.io/samvarankashyap/cvp-midstream-image:$latestTag
+          podman push midstream_image:$latestTag quay.io/cvpops/cvp-midstream-image:$latestTag
diff --git a/.github/workflows/build_and_push_latest_image.yml b/.github/workflows/build_and_push_latest_image.yml
@@ -32,7 +32,6 @@ jobs:
           QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
         run: |
           podman --version
-          cd Dockerfiles/midstream/
-          podman build -t midstream_image:latest -f Dockerfile --build-arg OPERATOR_SDK_VERSION=v1.4.0 --build-arg OPERATOR_TEST_PLAYBOOKS_TAG=master
+          podman build -t midstream_image:latest -f Dockerfiles/midstream/Dockerfile .
           podman login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io
-          podman push midstream_image:latest quay.io/samvarankashyap/cvp-midstream-image
+          podman push midstream_image:latest quay.io/cvpops/cvp-midstream-image:latest
diff --git a/.github/workflows/build_and_test_midstream_image.yml b/.github/workflows/build_and_test_midstream_image.yml
@@ -29,11 +29,9 @@ jobs:
       - name: "Build the midstream image inside Dockerfiles"
         run: |
           podman --version
-          cd Dockerfiles/midstream/
-          podman build -t midstream_image:latest -f Dockerfile --build-arg OPERATOR_SDK_VERSION=v1.4.0
+          podman build -t midstream_image:latest -f Dockerfiles/midstream/Dockerfile .
 
       - name: "Run unit tests"
         continue-on-error: false
         run: |
-          podman run -it -v $PWD:/project/operator-test-playbooks midstream_image:latest python3 /unit_tests.py
-
+          podman run --rm -ti --user=3149:0 midstream_image:latest unit_tests.py -vvv
diff --git a/.github/workflows/build_and_test_upstream_ci_image.yml b/.github/workflows/build_and_test_upstream_ci_image.yml
@@ -25,10 +25,9 @@ jobs:
       - name: "Build the upstream_ci_image inside Dockerfiles"
         run: |
           podman --version
-          podman build -t upstream_ci_image:latest -f Dockerfiles/ci/Dockerfile --build-arg OPERATOR_SDK_VERSION=v1.4.0
+          podman build -t upstream_ci_image:latest -f Dockerfiles/ci/Dockerfile
 
-      - name: "Run example operator-metadata with missing alm-examples through upstream_ci_image --> positive test"
+      - name: "Run the unit tests for the upstream operator CI"
         continue-on-error: false
         run: |
-          mkdir test_operator_work_dir output_logs
-          podman run -it -v $PWD:/project/operator-test-playbooks -v ./Dockerfiles/ci/example-metadata-without-alm-annotations:/project/operator_dir -v ./output_logs:/project/output -v ./test_operator_work_dir:/project/test_operator_work_dir -e TEST_NAME=test_for_report_success_empty_alm_examples -e OPERATOR_DIR=/project/operator_dir -e WORK_DIR=/project/output -e OPERATOR_WORK_DIR=/project/test_operator_work_dir/ upstream_ci_image:latest
+          podman run -it -v $PWD:/project/operator-test-playbooks -v ./Dockerfiles/ci:/project/test_dir -e TEST_DIR=/project/test_dir upstream_ci_image:latest
diff --git a/.github/workflows/otp_upstream_test.yml b/.github/workflows/otp_upstream_test.yml
@@ -6,7 +6,7 @@ env:
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ upstream-community ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -27,7 +27,7 @@ jobs:
       - name: Preparing operator test environment
         run: ansible-playbook $ANSIBLE_BASE_ARGS --tags host_build
       - name: Operator test
-        run: ansible-playbook $ANSIBLE_BASE_ARGS -e operator_dir=/tmp/community-operators-for-catalog/upstream-community-operators/aqua -e operator_version=6.0.0 --tags pure_test -e strict_mode=true -vv
+        run: ansible-playbook $ANSIBLE_BASE_ARGS -e operator_dir=/tmp/community-operators-for-catalog/upstream-community-operators/aqua -e operator_version=6.2.0 --tags pure_test -e strict_mode=true -vv
   otpu_manifest_to_bundle_format:
     name: Manifest to bundle format
     runs-on: ubuntu-latest
@@ -43,7 +43,7 @@ jobs:
       - name: Preparing operator test environment
         run: ansible-playbook $ANSIBLE_BASE_ARGS --tags host_build
       - name: Operator test
-        run: ansible-playbook $ANSIBLE_BASE_ARGS -e operator_dir=/tmp/community-operators-for-catalog/upstream-community-operators/aqua -e operator_version=6.0.0 --tags pure_test -e strict_mode=true -vv
+        run: ansible-playbook $ANSIBLE_BASE_ARGS -e operator_dir=/tmp/community-operators-for-catalog/upstream-community-operators/aqua -e operator_version=6.2.0 --tags pure_test -e strict_mode=true -vv
   otpu_index_from_scratch:
     name: Index from scratch
     runs-on: ubuntu-latest

diff --git a/Dockerfiles/ci/Dockerfile b/Dockerfiles/ci/Dockerfile
@@ -1,13 +1,17 @@
 FROM registry.fedoraproject.org/fedora:33
 WORKDIR /project
-ARG OPERATOR_SDK_VERSION=v1.4.0
+ARG OPERATOR_SDK_VERSION=v1.33.0
 RUN export ARCH=$(case $(arch) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(arch) ;; esac);\
     export OS=$(uname | awk '{print tolower($0)}');\
-    export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/$OPERATOR_SDK_VERSION/;\
-    curl -L -o /usr/local/bin/operator-sdk ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} \ 
-    && chmod a+x /usr/local/bin/operator-sdk && \
+    export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/$OPERATOR_SDK_VERSION;\
+    curl -L -o /usr/local/bin/operator-sdk ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} && \
+    chmod a+x /usr/local/bin/operator-sdk && \
+    curl -fL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/2.2.1/yq_linux_amd64 && \
+    chmod a+x /usr/local/bin/yq && \
+    curl -fL -o /usr/local/bin/umoci https://github.com/opencontainers/umoci/releases/download/v0.4.5/umoci.amd64 && \
+    chmod a+x /usr/local/bin/umoci && \
     mkdir /project/output && \
-    dnf install --setopt=install_weak_deps=False -y git-core ansible python3-pip mlocate && \
+    dnf install --setopt=install_weak_deps=False -y git-core ansible python3-pip mlocate jq skopeo && \
     dnf clean all && \
     pip3 install operator-courier
 ADD ./run_tests.py /run_tests.py

diff --git a/Dockerfiles/ci/README.md b/Dockerfiles/ci/README.md
@@ -25,9 +25,7 @@ podman run -it -v $PWD:/project/operator-test-playbooks -v ./Dockerfiles/ci/exam
 
 ---
 ** NOTE **
-
-currently there is only one test inside the container image i.e., test_for_report_failed_empty_alm_examples
-In order to add more tests please add more functions to run_tests.py inside the Dockerfiles/ci folder in operator-test-playbooks
+New tests can be created by adding functions to `Dockerfiles/ci/run_tests.py`.
 
 ---
 

diff --git a/Dockerfiles/ci/example-bundle-default-deprecated/manifests/backup.crd.yaml b/Dockerfiles/ci/example-bundle-default-deprecated/manifests/backup.crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: backups.velero.io
+  labels:
+    component: velero
+spec:
+  group: velero.io
+  version: v1
+  scope: Namespaced
+  names:
+    plural: backups
+    kind: Backup
diff --git a/Dockerfiles/ci/example-bundle-default-deprecated/manifests/backupstoragelocation.crd.yaml b/Dockerfiles/ci/example-bundle-default-deprecated/manifests/backupstoragelocation.crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: backupstoragelocations.velero.io
+  labels:
+    component: velero
+spec:
+  group: velero.io
+  version: v1
+  scope: Namespaced
+  names:
+    plural: backupstoragelocations
+    kind: BackupStorageLocation
diff --git a/Dockerfiles/ci/example-bundle-default-deprecated/manifests/deletebackuprequest.crd.yaml b/Dockerfiles/ci/example-bundle-default-deprecated/manifests/deletebackuprequest.crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: deletebackuprequests.velero.io
+  labels:
+    component: velero
+spec:
+  group: velero.io
+  version: v1
+  scope: Namespaced
+  names:
+    plural: deletebackuprequests
+    kind: DeleteBackupRequest
diff --git a/Dockerfiles/ci/example-bundle-default-deprecated/manifests/downloadrequest.crd.yaml b/Dockerfiles/ci/example-bundle-default-deprecated/manifests/downloadrequest.crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: downloadrequests.velero.io
+  labels:
+    component: velero
+spec:
+  group: velero.io
+  version: v1
+  scope: Namespaced
+  names:
+    plural: downloadrequests
+    kind: DownloadRequest