Removing --metadata-dir

openshift-eng · Oct 31, 2018 · 7a4b875 · 7a4b875
1 parent 8b9e62d
commit 7a4b875
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/jobs/build/openshift-online/scripts/merge-and-build-openshift-scripts.sh b/jobs/build/openshift-online/scripts/merge-and-build-openshift-scripts.sh
@@ -174,7 +174,7 @@ else
     echo "=========="
     echo "Update Dockerfiles"
     echo "=========="ild
-    ${OIT_PATH} --user=ocp-build --metadata-dir ${OIT_DIR} --working-dir ${OIT_WORKING} --group oso-${RELEASE_VERSION} \
+    ${OIT_PATH} --user=ocp-build --working-dir ${OIT_WORKING} --group oso-${RELEASE_VERSION} \
     images:rebase --version v${VERSION} \
     --release 1 \
     --message "MaxFileSize: 52428800" --push
@@ -183,7 +183,7 @@ else
     echo "=========="
     echo "Build Images"
     echo "=========="
-    ${OIT_PATH} --user=ocp-build --metadata-dir ${OIT_DIR} --working-dir ${OIT_WORKING} --group oso-${RELEASE_VERSION} \
+    ${OIT_PATH} --user=ocp-build --working-dir ${OIT_WORKING} --group oso-${RELEASE_VERSION} \
     images:build \
     --push-to-defaults --repo-type unsigned
 

diff --git a/jobs/build/ose/scripts/merge-and-build.sh b/jobs/build/ose/scripts/merge-and-build.sh
@@ -314,7 +314,7 @@ ose: ${OSE_DIR}
 openshift-ansible: ${OPENSHIFT_ANSIBLE_DIR}
 EOF
 
-${OIT_PATH} --user=ocp-build --metadata-dir ${OIT_DIR} --working-dir ${OIT_WORKING} --group openshift-${OSE_VERSION} \
+${OIT_PATH} --user=ocp-build --working-dir ${OIT_WORKING} --group openshift-${OSE_VERSION} \
 --sources ${OIT_WORKING}/sources.yml \
 images:rebase --version v${VERSION} \
 --release 1 \
@@ -326,7 +326,7 @@ echo "Build OIT images"
 echo "=========="
 
 if [ "$BUILD_CONTAINER_IMAGES" != "false" ]; then
-    ${OIT_PATH} --user=ocp-build --metadata-dir ${OIT_DIR} --working-dir ${OIT_WORKING} --group openshift-${OSE_VERSION} \
+    ${OIT_PATH} --user=ocp-build --working-dir ${OIT_WORKING} --group openshift-${OSE_VERSION} \
 images:build \
 --push-to-defaults --repo-type unsigned
 fi

diff --git a/jobs/build/scan-images/Jenkinsfile b/jobs/build/scan-images/Jenkinsfile
@@ -52,7 +52,6 @@ node('openshift-build-1') {
         sh """\
 set -o pipefail
 sudo python oit/tools/bin/oit \
-  --metadata-dir oit/ \
   --group 'openshift-${BUILD_VERSION}' \
   images:scan-for-cves \
   | tee scan.txt

diff --git a/pipeline-scripts/buildlib.groovy b/pipeline-scripts/buildlib.groovy
@@ -90,15 +90,15 @@ def oit(cmd, opts=[:]){
     cmd = cmd.replaceAll( ' \\ ', ' ' ) // If caller included line continuation characters, remove them
     return sh(
         returnStdout: opts.capture ?: false,
-        script: "${env.ENTERPRISE_IMAGES_DIR}/tools/bin/oit --user=ocp-build --metadata-dir ${env.ENTERPRISE_IMAGES_DIR} ${cmd.trim()}")
+        script: "${env.ENTERPRISE_IMAGES_DIR}/tools/bin/oit --user=ocp-build ${cmd.trim()}")
 }
 
 def elliott(cmd, opts=[:]){
     cmd = cmd.replaceAll( '\n', ' ' ) // Allow newlines in command for readability, but don't let them flow into the sh
     cmd = cmd.replaceAll( ' \\ ', ' ' ) // If caller included line continuation characters, remove them
     return sh(
         returnStdout: opts.capture ?: false,
-        script: "${env.ENTERPRISE_IMAGES_DIR}/tools/bin/elliott --user=ocp-build --metadata-dir ${env.ENTERPRISE_IMAGES_DIR} ${cmd.trim()}")
+        script: "${env.ENTERPRISE_IMAGES_DIR}/tools/bin/elliott --user=ocp-build ${cmd.trim()}")
 }
 
 def initialize_ose_dir() {