do demo

Author: danlarson-ibm

ci/ibm/Jenkinsfile

@@ -20,7 +20,7 @@ ansiColor("xterm") {
         ci/ibm/podman_jenkins.sh
 
         '''
-        def artifacts = ['op-build/timings.txt', 'upload.log']
+        def artifacts = ['upload.log']
         archiveArtifacts artifacts: artifacts.join(', '), allowEmptyArchive: true
 
         //cleanWs()

ci/ibm/podman_jenkins.sh

@@ -28,16 +28,15 @@ container_id=$(podman run -dit --userns=keep-id \
 podman cp $opbuild_dir $container_id:$working_dir
 
 # do the compile
-podman exec -w $working_dir $container_id /bin/bash -c "./op-build p10ebmc_defconfig && ./op-build"
-#podman exec -w $working_dir $container_id /bin/bash -c "./op-build p10ebmc_defconfig"
+#podman exec -w $working_dir $container_id /bin/bash -c "./op-build p10ebmc_defconfig && ./op-build"
+podman exec -w $working_dir $container_id /bin/bash -c "./op-build p10ebmc_defconfig"
 
 # Upload build images to artifactory
 podman exec -w $working_dir $container_id /bin/bash -c "./ci/ibm/upload_artifactory.sh"
 podman cp $container_id:$working_dir/upload.log $WORKSPACE
 echo "Browse https://na-public.artifactory.swg-devops.com/ui/native/pse-jet-sys-powerfw-generic-local/op-build/pr-$CHANGE_ID/$BUILD_NUMBER"
 
 
-
 # create unique tag for artifactory
 podman commit $container_id $remote_tag
 podman tag $remote_tag $latest_tag

ci/ibm/podman_local.sh

@@ -8,18 +8,17 @@ tag_name=${2:-op-build:$(git rev-parse --abbrev-ref HEAD)}
 
 working_dir=/home/$USER/op-build
 #exit
-#--no-cache
+#
 podman build --build-arg UID=$UID --build-arg GID=$(id -g) --build-arg USER=$USER -t $tag_name -f ci/ibm/Dockerfile ci/ibm 
 
 # mount the local repo into the container
 # mount ssh keys for additional cloning if required
 container_id=$(podman run -itd --userns=keep-id \
                 -v $opbuild_dir:$working_dir:z \
                 -v /home/$USER/.ssh:/home/$USER/.ssh:z \
-                -v /home/$USER/.jfrog:/home/$USER/.jfrog:z \
                 -w $working_dir $tag_name)
 
 # do the compile
-podman exec -w $working_dir $container_id /bin/bash -c "./op-build p10ebmc_defconfig && ./op-build"
+#podman exec -w $working_dir $container_id /bin/bash -c "./op-build p10ebmc_defconfig && ./op-build"