Restructure common operators scripts

.gitignore

@@ -5,6 +5,7 @@ build/_test
 bin/controller-gen
 bin/kustomize
 bundle/tests/scorecard/kuttl/kubeconfig
+operators
 vendor
 # Created by https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
 ### Emacs ###

.one-pipeline.yaml

@@ -8,12 +8,7 @@ setup:
 
     git clone --single-branch --branch $(get_env common-operators-branch) https://$(get_env git-token)@github.ibm.com/websphere/operators.git
     
-    cp operators/scripts/pipeline/* ./scripts/pipeline/
-    cp -rf operators/scripts/build ./scripts/
-    cp -rf operators/scripts/configure-cluster ./scripts
-    cp -rf operators/scripts/test ./scripts/
-    
-    ./scripts/pipeline/code-setup-stage.sh
+    ./operators/scripts/pipeline/code-setup-stage.sh
     
 detect-secrets:
   image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
@@ -35,7 +30,7 @@ test:
     #!/usr/bin/env bash
     echo $STAGE
 
-    ./scripts/pipeline/unit-test-stage.sh
+    ./operators/scripts/pipeline/unit-test-stage.sh
 
 static-scan:
   dind: true
@@ -45,7 +40,7 @@ static-scan:
     #!/usr/bin/env bash
     echo $STAGE
 
-    ./scripts/pipeline/static-scan-stage.sh
+    ./operators/scripts/pipeline/static-scan-stage.sh
 
 compliance-checks:
   image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.3
@@ -73,7 +68,7 @@ compliance-checks:
     #!/usr/bin/env bash
     echo $STAGE
 
-    ./scripts/pipeline/compliance-checks-stage.sh
+    ./operators/scripts/pipeline/compliance-checks-stage.sh
 
 containerize:
   dind: true
@@ -86,7 +81,7 @@ containerize:
     # instruct bash to exit if any command fails
     set -e
     
-    ./scripts/pipeline/containerize-stage.sh
+    ./operators/scripts/pipeline/containerize-stage.sh
 
 sign-artifact:
   abort_on_failure: false
@@ -95,7 +90,7 @@ sign-artifact:
     #!/usr/bin/env bash
     echo $STAGE
     
-    ./scripts/pipeline/sign-artifact-stage.sh
+    ./operators/scripts/pipeline/sign-artifact-stage.sh
 
 deploy:
   image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
@@ -113,7 +108,7 @@ dynamic-scan:
     #!/usr/bin/env bash
     echo $STAGE
 
-    ./scripts/pipeline/dynamic-scan-stage.sh
+    ./operators/scripts/pipeline/dynamic-scan-stage.sh
 
 acceptance-test:
   dind: true
@@ -124,7 +119,7 @@ acceptance-test:
 
     echo $STAGE
 
-    ./scripts/pipeline/acceptance-test-stage.sh
+    ./operators/scripts/pipeline/acceptance-test-stage.sh
 
 scan-artifact:
   abort_on_failure: false
@@ -133,7 +128,7 @@ scan-artifact:
     #!/usr/bin/env bash
     echo $STAGE
 
-    ./scripts/pipeline/scan-artifact-stage.sh
+    ./operators/scripts/pipeline/scan-artifact-stage.sh
 
 release:
   abort_on_failure: false
@@ -142,4 +137,4 @@ release:
     #!/usr/bin/env bash
     echo $STAGE
 
-    ./scripts/pipeline/release-stage.sh
+    ./operators/scripts/pipeline/release-stage.sh

Dockerfile.e2e

@@ -12,6 +12,6 @@ RUN wget --no-verbose --header "Accept: application/octet-stream" "https://golan
 
 COPY . .
 
-RUN scripts/installers/install-operator-sdk.sh
+RUN operators/scripts/installers/install-operator-sdk.sh
 
 CMD [ "bash" ]

Makefile

@@ -169,23 +169,11 @@ $(ENVTEST): $(LOCALBIN)
 
 .PHONY: setup
 setup: ## Ensure Operator SDK is installed.
-	./scripts/installers/install-operator-sdk.sh ${OPERATOR_SDK_RELEASE_VERSION}
+	./operators/scripts/installers/install-operator-sdk.sh ${OPERATOR_SDK_RELEASE_VERSION}
 
 .PHONY: setup-go
 setup-go: ## Ensure Go is installed.
-	./scripts/installers/install-go.sh ${GO_RELEASE_VERSION}
-
-.PHONY: setup-manifest
-setup-manifest: ## Install manifest tool.
-	./scripts/installers/install-manifest-tool.sh
-
-# Install Podman.
-install-podman:
-	./scripts/installers/install-podman.sh
-
-# Install OPM.
-install-opm:
-	./scripts/installers/install-opm.sh
+	./operators/scripts/installers/install-go.sh ${GO_RELEASE_VERSION}
 
 ##@ Development
 
@@ -339,29 +327,25 @@ catalog-build: opm ## Build a catalog image.
 	$(OPM) index add $(SKIP_TLS_VERIFY) --container-tool $(CONTAINER_COMMAND)  --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT) --permissive
 
 kind-e2e-test:
-	./scripts/test/e2e-kind.sh --test-tag "${TRAVIS_BUILD_NUMBER}"
+	./operators/scripts/test/e2e-kind.sh --test-tag "${TRAVIS_BUILD_NUMBER}"
 
 build-manifest: setup-manifest
-	./scripts/build/build-manifest.sh --registry "${PUBLISH_REGISTRY}" --image "${OPERATOR_IMAGE}" --tag "${RELEASE_TARGET}"
+	./operators/scripts/build/build-manifest.sh --registry "${PUBLISH_REGISTRY}" --image "${OPERATOR_IMAGE}" --tag "${RELEASE_TARGET}"
 
 build-operator-pipeline:
-	./scripts/build/build-operator.sh --registry "${REGISTRY}" --image "${PIPELINE_OPERATOR_IMAGE}" --tag "${RELEASE_TARGET}"
+	./operators/scripts/build/build-operator.sh --registry "${REGISTRY}" --image "${PIPELINE_OPERATOR_IMAGE}" --tag "${RELEASE_TARGET}"
 
 build-manifest-pipeline:
-	./scripts/build/build-manifest.sh --registry "${REGISTRY}" --image "${IMAGE}" --tag "${RELEASE_TARGET}"
+	./operators/scripts/build/build-manifest.sh --registry "${REGISTRY}" --image "${IMAGE}" --tag "${RELEASE_TARGET}"
 
 build-bundle-pipeline:
-	./scripts/build/build-bundle.sh --prod-image "${PIPELINE_PRODUCTION_IMAGE}" --registry "${REGISTRY}" --image "${PIPELINE_OPERATOR_IMAGE}" --tag "${RELEASE_TARGET}"
+	./operators/scripts/build/build-bundle.sh --prod-image "${PIPELINE_PRODUCTION_IMAGE}" --registry "${REGISTRY}" --image "${PIPELINE_OPERATOR_IMAGE}" --tag "${RELEASE_TARGET}"
 
 build-catalog-pipeline: opm ## Build a catalog image.
-	./scripts/build/build-catalog.sh -n "v${OPM_VERSION}" -b "${REDHAT_BASE_IMAGE}" -o "${OPM}" --container-tool "docker" -r "${REGISTRY}" -i "${PIPELINE_OPERATOR_IMAGE}-bundle:${RELEASE_TARGET}" -p "${PIPELINE_PRODUCTION_IMAGE}-bundle" -a "${PIPELINE_OPERATOR_IMAGE}-catalog:${RELEASE_TARGET}" -t "${PWD}/operator-build" -v "${VERSION}"
-
-test-e2e:
-	./scripts/e2e-release.sh --registry-name default-route --registry-namespace openshift-image-registry \
-                     --test-tag "${TRAVIS_BUILD_NUMBER}" --target "${RELEASE_TARGET}"
+	./operators/scripts/build/build-catalog.sh -n "v${OPM_VERSION}" -b "${REDHAT_BASE_IMAGE}" -o "${OPM}" --container-tool "docker" -r "${REGISTRY}" -i "${PIPELINE_OPERATOR_IMAGE}-bundle:${RELEASE_TARGET}" -p "${PIPELINE_PRODUCTION_IMAGE}-bundle" -a "${PIPELINE_OPERATOR_IMAGE}-catalog:${RELEASE_TARGET}" -t "${PWD}/operator-build" -v "${VERSION}"
 
 test-pipeline-e2e:
-	./scripts/test/e2e-ocp.sh -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" \
+	./operators/scripts/test/e2e-ocp.sh -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" \
                      --cluster-url "${CLUSTER_URL}" --cluster-user "${CLUSTER_USER}" --cluster-token "${CLUSTER_TOKEN}" \
                      --registry-name "${PIPELINE_REGISTRY}" --registry-image "${PIPELINE_OPERATOR_IMAGE}" \
                      --registry-user "${PIPELINE_USERNAME}" --registry-password "${PIPELINE_PASSWORD}" \

ebcDockerBuilderRCO.jenkinsfile

@@ -92,7 +92,7 @@ def gitCloneAndStash() {
       git branch: "main", url: "[email protected]:websphere/operators.git"
       sh "git checkout ${COMMON_OPERATORS_BRANCH}"
   }
-  sh "cp -rf operators/scripts/build runtime-component-operator/scripts/"
+  sh "cp -rf operators runtime-component-operator/"
   dir('runtime-component-operator') {
       stash(name: 'runtime-component-operator')
    }
@@ -105,7 +105,7 @@ def void doWork(){
 
    // Unstash the git repo
    unstash(name: 'runtime-component-operator')
-   sh "./scripts/build/build-initialize.sh"
+   sh "./operators/scripts/build/build-initialize.sh"
    sh "${command}"
 }